-
Notifications
You must be signed in to change notification settings - Fork 47
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
⚠️ Update to go 1.22 #909
⚠️ Update to go 1.22 #909
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT | ||
|
||
go 1.21 | ||
go 1.22.0 | ||
|
||
toolchain go1.22.1 | ||
toolchain go1.22.2 | ||
|
||
require sigs.k8s.io/controller-tools v0.14.0 // cmd/controller-gen | ||
require sigs.k8s.io/controller-tools v0.15.0 // cmd/controller-gen |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -75,11 +75,14 @@ reg_pkg_name="${REG_PKG_NAME}" | |
( | ||
cd "${REG_DIR}" && \ | ||
$operator_sdk init --domain="${DOMAIN}" && \ | ||
sed -i -e 's/CONTROLLER_TOOLS_VERSION ?= v0.14.0/CONTROLLER_TOOLS_VERSION ?= v0.15.0/' Makefile && \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Delete this line? Also while we're at it, could you add some comments about this Something like these:
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. (sorry, didn't see/think of this when we were debugging it) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'll make sure it still works without this... |
||
sed -i -e 's/CONTROLLER_TOOLS_VERSION ?= v0.13.0/CONTROLLER_TOOLS_VERSION ?= v0.15.0/' Makefile && \ | ||
$operator_sdk create api \ | ||
--group="${DOMAIN}" \ | ||
--version v1alpha1 \ | ||
--kind Registry \ | ||
--resource --controller && \ | ||
export OPERATOR_SDK="${operator_sdk}" && \ | ||
make generate manifests && \ | ||
make docker-build IMG="${reg_img}" && \ | ||
sed -i -e 's/$(OPERATOR_SDK) generate kustomize manifests -q/$(OPERATOR_SDK) generate kustomize manifests -q --interactive=false/g' Makefile && \ | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We are using an updated controller gen to generate and test manifests for operator controller, but keeping controller-runtime tied to a previous version. We can either bump controller-gen for o-c in a follow up with others, or do it all here. I would suggest the former, to keep this PR confined to fixing operator sdk with go 1.22 bump.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bumping controller-runtime starts a cascade effect of including k8s v0.30.0, so, yes, I'd prefer to do it later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good, then we don't need the changes in
.bingo/
. The only change required for controller-gen would be in the set up script that gets used for scaffolding the operator using SDK.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The changes in bingo are necessary to install the the correct version of controller-gen, and to install a version of bingo that is compatible with go 1.22.