From ceb83a0357eda1dc77be41c3892c1ad62cb576dd Mon Sep 17 00:00:00 2001 From: Daniel Fan Date: Wed, 22 Nov 2023 08:41:00 -0800 Subject: [PATCH] Bump ODLM to 4.2.2 Signed-off-by: Daniel Fan --- Makefile | 2 +- ...eployment-lifecycle-manager.clusterserviceversion.yaml | 8 ++++---- common/scripts/next-csv.sh | 2 ++ ...eployment-lifecycle-manager.clusterserviceversion.yaml | 4 ++-- version/version.go | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index f588bec2..3e59982f 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.2.1 +OPERATOR_VERSION ?= 4.2.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 0b388dc0..ca8773ff 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: "2023-11-03T17:30:05Z" 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.2.1' + olm.skipRange: '>=1.2.0 <4.2.2' operators.openshift.io/infrastructure-features: '["disconnected"]' operators.operatorframework.io/builder: operator-sdk-v1.29.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.2.1 + name: operand-deployment-lifecycle-manager.v4.2.2 namespace: placeholder spec: apiservicedefinitions: {} @@ -786,7 +786,7 @@ spec: minKubeVersion: 1.19.0 provider: name: IBM - version: 4.2.1 + version: 4.2.2 relatedImages: - - image: icr.io/cpopen/odlm:4.2.1 + - image: icr.io/cpopen/odlm:4.2.2 name: ODLM_IMAGE diff --git a/common/scripts/next-csv.sh b/common/scripts/next-csv.sh index f0783e51..12279c24 100755 --- a/common/scripts/next-csv.sh +++ b/common/scripts/next-csv.sh @@ -35,6 +35,7 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then # Update config/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml sed -i "/olm.skipRange/s/$CURRENT_DEV_CSV/$NEW_DEV_CSV/g" config/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml + sed -i "s/odlm:$CURRENT_DEV_CSV/odlm:$NEW_DEV_CSV/g" config/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml echo "Updated the config/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml" sed -i "s/OPERATOR_VERSION ?= $CURRENT_DEV_CSV/OPERATOR_VERSION ?= $NEW_DEV_CSV/g" Makefile @@ -54,6 +55,7 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then # Update config/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml sed -i "" "/olm.skipRange/s/$CURRENT_DEV_CSV/$NEW_DEV_CSV/g" config/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml + sed -i "" "s/odlm:$CURRENT_DEV_CSV/odlm:$NEW_DEV_CSV/g" config/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml echo "Updated the config/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml" sed -i "" "s/OPERATOR_VERSION ?= $CURRENT_DEV_CSV/OPERATOR_VERSION ?= $NEW_DEV_CSV/g" Makefile diff --git a/config/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml b/config/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml index 88d5602e..12b80865 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.2.1' + olm.skipRange: '>=1.2.0 <4.2.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 @@ -467,6 +467,6 @@ spec: provider: name: IBM relatedImages: - - image: icr.io/cpopen/odlm:4.2.1 + - image: icr.io/cpopen/odlm:4.2.2 name: ODLM_IMAGE version: 0.0.0 diff --git a/version/version.go b/version/version.go index 2d5c3966..84c11b15 100644 --- a/version/version.go +++ b/version/version.go @@ -17,5 +17,5 @@ package version var ( - Version = "4.2.1" + Version = "4.2.2" )