From 7565f10653a174c1388d6c7109167cbdf6efda27 Mon Sep 17 00:00:00 2001 From: Jan Stourac Date: Thu, 24 Oct 2024 12:13:45 +0200 Subject: [PATCH 1/2] [Test] Update the k8s tool used for the test execution The version 1.23 is no longer supported [1] and only releases from 1.28 - 1.31 versions are supported. Based on the [2], the OpenShift 4.13 (oldest we care about right now) is based on Kubernetes in version 1.26, so let's allign to that version. * [1] https://kubernetes.io/releases/ * [2] https://access.redhat.com/solutions/4870701 --- components/odh-notebook-controller/Makefile | 2 +- components/profile-controller/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/odh-notebook-controller/Makefile b/components/odh-notebook-controller/Makefile index 8c223728285..f0fe774245b 100644 --- a/components/odh-notebook-controller/Makefile +++ b/components/odh-notebook-controller/Makefile @@ -9,7 +9,7 @@ KF_TAG ?= main-648689f CONTAINER_ENGINE ?= podman # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. -ENVTEST_K8S_VERSION = 1.23 +ENVTEST_K8S_VERSION = 1.26 # Kubernetes configuration K8S_NAMESPACE ?= odh-notebook-controller-system diff --git a/components/profile-controller/Makefile b/components/profile-controller/Makefile index 40b96cf9730..10f0ad4dc3c 100644 --- a/components/profile-controller/Makefile +++ b/components/profile-controller/Makefile @@ -4,7 +4,7 @@ TAG ?= $(shell git describe --tags --always --dirty) ARCH ?= linux/amd64 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. -ENVTEST_K8S_VERSION = 1.23 +ENVTEST_K8S_VERSION = 1.26 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) From a2c94c8ba976ed5d82e959330b5e140c48094cca Mon Sep 17 00:00:00 2001 From: Jan Stourac Date: Fri, 25 Oct 2024 15:59:37 +0200 Subject: [PATCH 2/2] [Fix] kustomize package version revision This is a followup of #391 (1b2dd4fa594937e81aeae886c476cecef19e6dc7). Without this, we can see the following failure during the e2e tests execution: ``` make run-ci-e2e-tests ... GOBIN=/home/jstourac/workspace/rhosai/odh/kubeflow/components/odh-notebook-controller/bin go install sigs.k8s.io/kustomize/v3/cmd/kustomize@v5.0.2 go: sigs.k8s.io/kustomize/v3/cmd/kustomize@v5.0.2: sigs.k8s.io/kustomize/v3/cmd/kustomize@v5.0.2: invalid version: unknown revision v3/cmd/kustomize/v5.0.2 make[1]: *** [Makefile:243: kustomize] Error 1 ... ``` This caused that all e2e tests failed. After this fix, some e2e tests pass. The other seem to fail on a problem unrelated to this one. --- components/notebook-controller/Makefile | 2 +- components/odh-notebook-controller/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/notebook-controller/Makefile b/components/notebook-controller/Makefile index 019d1bd92eb..9d698c4bc67 100644 --- a/components/notebook-controller/Makefile +++ b/components/notebook-controller/Makefile @@ -148,7 +148,7 @@ controller-gen: ## Download controller-gen locally if necessary. KUSTOMIZE = $(shell pwd)/bin/kustomize .PHONY: kustomize kustomize: ## Download kustomize locally if necessary. - $(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/v3/cmd/kustomize@v5.0.2) + $(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v5@v5.0.2) ENVTEST = $(shell pwd)/bin/setup-envtest ENVTEST_VERSION?=v0.0.0-20240923090159-236e448db12c diff --git a/components/odh-notebook-controller/Makefile b/components/odh-notebook-controller/Makefile index f0fe774245b..4517572a54b 100644 --- a/components/odh-notebook-controller/Makefile +++ b/components/odh-notebook-controller/Makefile @@ -234,7 +234,7 @@ controller-gen: ## Download controller-gen locally if necessary. KUSTOMIZE = $(LOCALBIN)/kustomize .PHONY: kustomize kustomize: ## Download kustomize locally if necessary. - GOBIN=$(LOCALBIN) go install sigs.k8s.io/kustomize/v3/cmd/kustomize@v5.0.2 + GOBIN=$(LOCALBIN) go install sigs.k8s.io/kustomize/kustomize/v5@v5.0.2 ENVTEST = $(LOCALBIN)/setup-envtest .PHONY: envtest