From ab6ffe182a7dfbf882cbe73d771eb7198b54b374 Mon Sep 17 00:00:00 2001 From: Daniel Fan Date: Thu, 23 May 2024 13:28:40 -0400 Subject: [PATCH] Bump ODLM to 4.3.2 for 4.6.3 (#1047) * Bump ODLM to 4.3.2 for 4.6.3 Signed-off-by: Daniel Fan * Rollback package setup-envtest due to issue https://github.com/kubernetes-sigs/controller-runtime/issues/2838 Signed-off-by: Daniel Fan --------- Signed-off-by: Daniel Fan --- Makefile | 2 +- ...eployment-lifecycle-manager.clusterserviceversion.yaml | 8 ++++---- common/Makefile.common.mk | 2 +- ...eployment-lifecycle-manager.clusterserviceversion.yaml | 4 ++-- version/version.go | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 25ed9673..e611955c 100644 --- a/Makefile +++ b/Makefile @@ -84,7 +84,7 @@ OPERATOR_IMAGE_NAME ?= odlm # Current Operator bundle image name BUNDLE_IMAGE_NAME ?= odlm-operator-bundle # Current Operator version -OPERATOR_VERSION ?= 4.3.1 +OPERATOR_VERSION ?= 4.3.2 # Kind cluster name KIND_CLUSTER_NAME ?= "odlm" diff --git a/bundle/manifests/operand-deployment-lifecycle-manager.clusterserviceversion.yaml b/bundle/manifests/operand-deployment-lifecycle-manager.clusterserviceversion.yaml index 0eda067c..c934b4fa 100644 --- a/bundle/manifests/operand-deployment-lifecycle-manager.clusterserviceversion.yaml +++ b/bundle/manifests/operand-deployment-lifecycle-manager.clusterserviceversion.yaml @@ -132,7 +132,7 @@ metadata: createdAt: "2024-04-04T03:40:45Z" description: The Operand Deployment Lifecycle Manager provides a Kubernetes CRD-based API to manage the lifecycle of operands. nss.operator.ibm.com/managed-operators: ibm-odlm - olm.skipRange: '>=1.2.0 <4.3.1' + olm.skipRange: '>=1.2.0 <4.3.2' operators.openshift.io/infrastructure-features: '["disconnected"]' operators.operatorframework.io/builder: operator-sdk-v1.32.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 @@ -143,7 +143,7 @@ metadata: operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported operatorframework.io/os.linux: supported - name: operand-deployment-lifecycle-manager.v4.3.1 + name: operand-deployment-lifecycle-manager.v4.3.2 namespace: placeholder spec: apiservicedefinitions: {} @@ -860,7 +860,7 @@ spec: minKubeVersion: 1.19.0 provider: name: IBM - version: 4.3.1 + version: 4.3.2 relatedImages: - - image: icr.io/cpopen/odlm:4.3.1 + - image: icr.io/cpopen/odlm:4.3.2 name: ODLM_IMAGE diff --git a/common/Makefile.common.mk b/common/Makefile.common.mk index b7c20102..4574e06a 100644 --- a/common/Makefile.common.mk +++ b/common/Makefile.common.mk @@ -94,7 +94,7 @@ kind: ## Download kind locally if necessary. ENVTEST = $(shell pwd)/common/bin/setup-envtest setup-envtest: ## Download envtest-setup locally if necessary. - $(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest) + $(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@7b4325d5a38dff0c7eb9a939d079950eafcc4f7e) FINDFILES=find . \( -path ./.git -o -path ./.github -o -path ./testcrds \) -prune -o -type f XARGS = xargs -0 ${XARGS_FLAGS} diff --git a/config/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml b/config/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml index 070a2957..3524ce90 100644 --- a/config/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml +++ b/config/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml @@ -11,7 +11,7 @@ metadata: description: The Operand Deployment Lifecycle Manager provides a Kubernetes CRD-based API to manage the lifecycle of operands. nss.operator.ibm.com/managed-operators: ibm-odlm - olm.skipRange: '>=1.2.0 <4.3.1' + olm.skipRange: '>=1.2.0 <4.3.2' operators.openshift.io/infrastructure-features: '["disconnected"]' operators.operatorframework.io/builder: operator-sdk-v1.2.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v2 @@ -482,6 +482,6 @@ spec: provider: name: IBM relatedImages: - - image: icr.io/cpopen/odlm:4.3.1 + - image: icr.io/cpopen/odlm:4.3.2 name: ODLM_IMAGE version: 0.0.0 diff --git a/version/version.go b/version/version.go index 58d53ca2..d8a15ba7 100644 --- a/version/version.go +++ b/version/version.go @@ -17,5 +17,5 @@ package version var ( - Version = "4.3.1" + Version = "4.3.2" )