Skip to content

Commit c713966

Browse files
committed
[RHOAIENG-29976] bump the envtest and go controller tools version
Since we moved to golang 1.24, we can now use the latest setup-envtest https://github.com/kubernetes-sigs/controller-runtime/blob/948d554cd9c7692f21139384afaafaea8524626f/tools/setup-envtest/README.md
1 parent 4b6d27e commit c713966

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

components/notebook-controller/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ docker-build-multi-arch: ## Build multi-arch docker images with docker buildx
104104

105105

106106
.PHONY: docker-build-push-multi-arch
107-
docker-build-push-multi-arch: ## Build multi-arch docker images with docker buildx and push to docker registry
107+
docker-build-push-multi-arch: ## Build multi-arch docker images with docker buildx and push to docker registry
108108
cd .. && docker buildx build --platform ${ARCH} --tag ${IMG}:${TAG} --push -f ./notebook-controller/Dockerfile .
109109

110110

@@ -143,15 +143,15 @@ $(LOCALBIN): ## Ensure that the directory exists
143143
CONTROLLER_GEN = $(LOCALBIN)/controller-gen
144144
.PHONY: controller-gen
145145
controller-gen: ## Download controller-gen locally if necessary.
146-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.3
146+
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.18.0
147147

148148
KUSTOMIZE = $(shell pwd)/bin/kustomize
149149
.PHONY: kustomize
150150
kustomize: ## Download kustomize locally if necessary.
151151
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])
152152

153153
ENVTEST = $(shell pwd)/bin/setup-envtest
154-
ENVTEST_VERSION?=v0.0.0-20240923090159-236e448db12c
154+
ENVTEST_VERSION?=v0.0.0-20250723164028-948d554cd9c7
155155

156156
.PHONY: envtest
157157
envtest: ## Download setup-envtest locally if necessary.

components/odh-notebook-controller/Makefile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ KF_TAG ?= $(KF_TAG)
1212
CONTAINER_ENGINE ?= podman
1313

1414
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
15-
ENVTEST_K8S_VERSION = 1.26
15+
# We should try to use the kubernetes version that is used in the oldest OpenShift we support: https://access.redhat.com/solutions/4870701
16+
# Right now we target the OCP 4.15 as the oldest one: https://access.redhat.com/articles/rhoai-supported-configs
17+
ENVTEST_K8S_VERSION = 1.28
1618

1719
# Kubernetes configuration
1820
K8S_NAMESPACE ?= odh-notebook-controller-system
@@ -232,17 +234,19 @@ $(LOCALBIN): ## Ensure that the directory exists
232234
CONTROLLER_GEN = $(LOCALBIN)/controller-gen
233235
.PHONY: controller-gen
234236
controller-gen: ## Download controller-gen locally if necessary.
235-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.3
237+
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.18.0
236238

237239
KUSTOMIZE = $(LOCALBIN)/kustomize
238240
.PHONY: kustomize
239241
kustomize: ## Download kustomize locally if necessary.
240242
GOBIN=$(LOCALBIN) go install sigs.k8s.io/kustomize/kustomize/[email protected]
241243

242244
ENVTEST = $(LOCALBIN)/setup-envtest
245+
ENVTEST_VERSION?=v0.0.0-20250723164028-948d554cd9c7
246+
243247
.PHONY: envtest
244-
envtest: ## Download setup-envtest locally if necessary.
245-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@v0.0.0-20240923090159-236e448db12c
248+
envtest: ## Download setup-envtest locally if necessary - https://pkg.go.dev/sigs.k8s.io/controller-runtime/tools/setup-envtest#section-readme
249+
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@$(ENVTEST_VERSION)
246250

247251
KTUNNEL = $(LOCALBIN)/ktunnel
248252
.PHONY: ktunnel

0 commit comments

Comments
 (0)