Skip to content

Bump k8s and kind#279

Merged
hasanawad94 merged 4 commits intoshipwright-io:mainfrom
hasanawad94:bump-k8s-v19
Mar 8, 2026
Merged

Bump k8s and kind#279
hasanawad94 merged 4 commits intoshipwright-io:mainfrom
hasanawad94:bump-k8s-v19

Conversation

@hasanawad94
Copy link
Copy Markdown
Contributor

@hasanawad94 hasanawad94 commented Feb 23, 2026

Changes

  • Bump k8s, Go and kind in ci.yaml
  • Upgrade controller-gen to a version compatible with Go 1.25
  • Ran make bundle and updated sdk version in install-operator-sdk.sh

Submitter Checklist

  • Includes tests if functionality changed/was added
  • Includes docs if changes are user-facing
  • Set a kind label on this PR
  • Release notes block has been filled in, or marked NONE

See the contributor guide
for details on coding conventions, github and prow interactions, and the code review process.

Release Notes

NONE

Signed-off-by: Hasan Awad <hasan.m.awad94@gmail.com>
@hasanawad94 hasanawad94 added the kind/dependency-change Categorizes issue or PR as related to changing dependencies label Feb 23, 2026
@pull-request-size pull-request-size Bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 23, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Feb 23, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign heavywombat for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@adambkaplan adambkaplan added this to the release-v0.19.0 milestone Feb 23, 2026
Signed-off-by: Hasan Awad <hasan.m.awad94@gmail.com>
@hasanawad94 hasanawad94 force-pushed the bump-k8s-v19 branch 3 times, most recently from 8af7a8e to 58f6dfe Compare February 24, 2026 09:11
@pull-request-size pull-request-size Bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 24, 2026
Upgrade controller-gen to a version compatible with Go 1.25
Ran make bundle and updated sdk version in install-operator-sdk.sh

Signed-off-by: Hasan Awad <hasan.m.awad94@gmail.com>
@IrvingMg
Copy link
Copy Markdown
Member

/lgtm

CC: @shipwright-io/maintainers for review/approval

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Feb 26, 2026
Copy link
Copy Markdown
Member

@adambkaplan adambkaplan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got a few questions before I'm ready to mark this "approved".

I think you can also squash commits (and please provide a detailed explanation of the "why" behind the operator-sdk update in your commit message).


DEST="${1:-bin/operator-sdk}"
SDK_VERSION="${SDK_VERSION:-1.18.0}"
SDK_VERSION="${SDK_VERSION:-1.32.0}"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this fix #139 ?!

I thought operator-sdk enforced strict layouts for supported operators. Is that not the case any more?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The generate and bundle commands work the same way and haven't changed in any breaking way between those versions.
I saw that the v1.33 release made go/v4 the default plugin for new projects
https://github.com/operator-framework/operator-sdk/releases/tag/v1.33.0

Comment thread Makefile
bundle: manifests kustomize operator-sdk ko ## Generate bundle manifests and metadata, then validate generated files.
$(OPERATOR_SDK) generate kustomize manifests --interactive=false -q
$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
$(SED_BIN) -i.bak '/^ createdAt: /d' bundle/manifests/shipwright-operator.clusterserviceversion.yaml && rm -f bundle/manifests/shipwright-operator.clusterserviceversion.yaml.bak
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This warrants a bit of explanation - why is this necessary?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes my bad for not explaining. The verify-bundle step in ci.yml was failing with this error after changing to operator-sdk to v1.32.0:

Differences:
diff --git a/bundle/manifests/shipwright-operator.clusterserviceversion.yaml b/bundle/manifests/shipwright-operator.clusterserviceversion.yaml
index 4208885..363a693 100644
--- a/bundle/manifests/shipwright-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/shipwright-operator.clusterserviceversion.yaml
@@ -19,7 +19,7 @@ metadata:
     categories: Developer Tools
     certified: "false"
     containerImage: ko://github.com/shipwright-io/operator
-    createdAt: "2026-02-24T09:19:08Z"
+    createdAt: "2026-02-24T09:23:16Z"
     description: Shipwright is a framework for building container images on Kubernetes.
     operators.operatorframework.io/builder: operator-sdk-v1.32.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
+ exit 1
make: *** [Makefile:244: verify-bundle] Error 1
Error: Process completed with exit code 2.

Its regenerating the createdAt when make bundle runs which didnt happen in v1.18.0. So I thought to strip the createdAt for now.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a comment documenting this issue. I'd love to move off operator-sdk entirely, but that is a bigger issue for another day.

@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 5, 2026
@hasanawad94 hasanawad94 requested a review from adambkaplan March 5, 2026 12:09
Signed-off-by: Hasan Awad <hasan.m.awad94@gmail.com>
Copy link
Copy Markdown
Member

@IrvingMg IrvingMg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

Please squash the commits.

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 8, 2026
@hasanawad94 hasanawad94 merged commit fabf485 into shipwright-io:main Mar 8, 2026
4 of 5 checks passed
@github-project-automation github-project-automation Bot moved this to Done in Issues Mar 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/dependency-change Categorizes issue or PR as related to changing dependencies lgtm Indicates that a PR is ready to be merged. release-note-none size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants