THREESCALE-12323 Upgrade operator envtest and controller-runtime used in CI#1141
THREESCALE-12323 Upgrade operator envtest and controller-runtime used in CI#1141urbanikb wants to merge 3 commits into3scale:masterfrom
Conversation
urbanikb
force-pushed
the
THREESCALE-12323
branch
2 times, most recently
from
ab31258 to
3abe227
Compare
| ## Location to install dependencies to | ||
| LOCALBIN ?= $(PROJECT_PATH)/bin | ||
| $(LOCALBIN): | ||
| mkdir -p $(LOCALBIN) |
| # go-install-tool will 'go install' any package with custom target and name of binary, if it doesn't exist | ||
| # $1 - target path with name of binary | ||
| # $2 - package url which can be installed | ||
| # $3 - specific version of package | ||
| define go-install-tool | ||
| @[ -f "$(1)-$(3)" ] || { \ | ||
| set -e; \ | ||
| package=$(2)@$(3) ;\ | ||
| echo "Downloading $${package}" ;\ | ||
| rm -f $(1) || true ;\ | ||
| GOBIN=$(LOCALBIN) go install $${package} ;\ | ||
| mv $(1) $(1)-$(3) ;\ | ||
| } ;\ | ||
| ln -sf $(1)-$(3) $(1) | ||
| endef |
There was a problem hiding this comment.
Get rid of go-bin-install and move this to the same line
| go 1.22 | ||
| go 1.22.0 | ||
|
|
||
| toolchain go1.22.10 |
There was a problem hiding this comment.
Remove the ending .0, we previously had issues with the build system; it wasn't recognizing the correct version of Go. I'm not sure if this issue has been fixed or not, but it's best to remove it to avoid any headache.
Perhaps also update the toolchain version, when I run go mod tidy, toolchain was bumped to go1.22.12
diff --git a/go.mod b/go.mod
index 1d02afbf..ea010cd2 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,8 @@
module github.com/3scale/3scale-operator
-go 1.22
+go 1.22.0
-toolchain go1.22.10
+toolchain go1.22.12
....| - capabilities.3scale.net | ||
| resources: | ||
| - applicationauths | ||
| verbs: |
There was a problem hiding this comment.
Hmm, this worries me. Maybe we should check the controller-gen changelog to see if they made any breaking changes.
|
/retest |
- controller-runtime@1.19.7 requires k8s@1.31.X
- k8s@1.31.X requires controller-tools@0.16.X
- in this version of controller-runtime the envtest-setup has been
replaced with a tool installed with go -> Makefile needs
to be updated
- some duplication now exists in Makefile - the "newer" style
of installing tools is form more recent skeleton project, I have
only updated binaries that need to change to limit scope of this
change
urbanikb
force-pushed
the
THREESCALE-12323
branch
from
3abe227 to
7876f98
Compare
|
PR needs rebase. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
2 participants
What
Fix:
Validation
Run E2E test against existing cluster:
make test-e2eThis PR contains patch to
controller-runtimeand dependencies:k8sversion v0.29.0 -> v0.31.0controller-toolsversion v0.14.0 -> v0.16.5