From 3562f1ed40b693761ef43ec17cf806e54ea1e6d9 Mon Sep 17 00:00:00 2001 From: Daniel Fan Date: Mon, 22 Apr 2024 15:29:40 -0700 Subject: [PATCH] Bump 4.7.0 for CPFS 4.7.0 release Signed-off-by: Daniel Fan --- Makefile | 6 +++--- README.md | 2 +- bundle.Dockerfile | 4 ++-- ...n-service-operator.clusterserviceversion.yaml | 16 +++++++--------- bundle/metadata/annotations.yaml | 4 ++-- common/scripts/multiarch_image.sh | 2 +- ...n-service-operator.clusterserviceversion.yaml | 10 ++++------ testdata/deploy/deploy.yaml | 4 ++-- version/version.go | 2 +- 9 files changed, 23 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index 78b3a0137..ec5d648ea 100644 --- a/Makefile +++ b/Makefile @@ -80,8 +80,8 @@ OPERATOR_IMAGE_NAME ?= common-service-operator # Current Operator bundle image name BUNDLE_IMAGE_NAME ?= common-service-operator-bundle -CHANNELS := v4.6 -DEFAULT_CHANNEL := v4.6 +CHANNELS := v4.7 +DEFAULT_CHANNEL := v4.7 # Options for 'bundle-build' ifneq ($(origin CHANNELS), undefined) @@ -237,7 +237,7 @@ bundle-manifests: clis generate-all: yq kustomize operator-sdk generate manifests cloudpak-theme-version ## Generate bundle manifests, metadata and package manifests $(OPERATOR_SDK) generate kustomize manifests -q - - make bundle-manifests CHANNELS=v4.6 DEFAULT_CHANNEL=v4.6 + - make bundle-manifests CHANNELS=v4.7 DEFAULT_CHANNEL=v4.7 ##@ Test diff --git a/README.md b/README.md index d642c2ca9..201ad1a82 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Red Hat OpenShift Container Platform 4.3 or newer installed on one of the follow ## Operator versions - - 4.6.0 + - 4.7.0 ## Prerequisites diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 2e39c1153..8cabedba0 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -5,8 +5,8 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=ibm-common-service-operator -LABEL operators.operatorframework.io.bundle.channels.v1=v4.6 -LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.6 +LABEL operators.operatorframework.io.bundle.channels.v1=v4.7 +LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.7 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.31.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 diff --git a/bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml b/bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml index 17504e517..ca5bcb01d 100644 --- a/bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml +++ b/bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml @@ -27,9 +27,9 @@ metadata: description: The IBM Cloud Pak foundational services operator is used to deploy IBM foundational services. nss.operator.ibm.com/managed-operators: ibm-common-service-operator nss.operator.ibm.com/managed-webhooks: "" - olm.skipRange: ">=3.3.0 <4.6.0" - operatorChannel: v4.6 - operatorVersion: 4.6.0 + olm.skipRange: ">=3.3.0 <4.7.0" + operatorChannel: v4.7 + operatorVersion: 4.7.0 operators.openshift.io/infrastructure-features: '["disconnected"]' operators.operatorframework.io/builder: operator-sdk-v1.31.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 @@ -40,7 +40,7 @@ metadata: operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported operatorframework.io/os.linux: supported - name: ibm-common-service-operator.v4.6.0 + name: ibm-common-service-operator.v4.7.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -201,7 +201,7 @@ spec: ## Operator versions - - 4.6.0 + - 4.7.0 ## Prerequisites @@ -577,7 +577,7 @@ spec: minKubeVersion: 1.19.0 provider: name: IBM - version: 4.6.0 + version: 4.7.0 webhookdefinitions: - admissionReviewVersions: - v1 @@ -620,7 +620,5 @@ spec: type: ValidatingAdmissionWebhook webhookPath: /validate-operator-ibm-com-v3-commonservice relatedImages: - - image: icr.io/cpopen/common-service-operator:4.6.0 + - image: icr.io/cpopen/common-service-operator:4.7.0 name: COMMON_SERVICE_OPERATOR_IMAGE - - image: icr.io/cpopen/cpfs/cpfs-utils:latest - name: CPFS_UTILS_IMAGE diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 2823d698e..bfe46032c 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -4,8 +4,8 @@ annotations: operators.operatorframework.io.bundle.manifests.v1: manifests/ operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: ibm-common-service-operator - operators.operatorframework.io.bundle.channels.v1: v4.6 - operators.operatorframework.io.bundle.channel.default.v1: v4.6 + operators.operatorframework.io.bundle.channels.v1: v4.7 + operators.operatorframework.io.bundle.channel.default.v1: v4.7 operators.operatorframework.io.metrics.builder: operator-sdk-v1.31.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 diff --git a/common/scripts/multiarch_image.sh b/common/scripts/multiarch_image.sh index 10a1cd937..c33b74846 100755 --- a/common/scripts/multiarch_image.sh +++ b/common/scripts/multiarch_image.sh @@ -24,7 +24,7 @@ ALL_PLATFORMS="amd64 ppc64le s390x" IMAGE_REPO=${1} IMAGE_NAME=${2} VERSION=${3-"$(git describe --exact-match 2> /dev/null || git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)"} -RELEASE_VERSION=${4:-4.6.0} +RELEASE_VERSION=${4:-4.7.0} MAX_PULLING_RETRY=${MAX_PULLING_RETRY-10} RETRY_INTERVAL=${RETRY_INTERVAL-10} # support other container tools, e.g. podman diff --git a/config/manifests/bases/ibm-common-service-operator.clusterserviceversion.yaml b/config/manifests/bases/ibm-common-service-operator.clusterserviceversion.yaml index f5f48f02a..e4d6ef2bc 100644 --- a/config/manifests/bases/ibm-common-service-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/ibm-common-service-operator.clusterserviceversion.yaml @@ -12,8 +12,8 @@ metadata: nss.operator.ibm.com/managed-operators: ibm-common-service-operator nss.operator.ibm.com/managed-webhooks: "" olm.skipRange: "" - operatorChannel: v4.6 - operatorVersion: 4.6.0 + operatorChannel: v4.7 + operatorVersion: 4.7.0 operators.openshift.io/infrastructure-features: '["disconnected"]' operators.operatorframework.io/builder: operator-sdk-v1.2.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v2 @@ -189,7 +189,7 @@ spec: ## Operator versions - - 4.6.0 + - 4.7.0 ## Prerequisites @@ -261,8 +261,6 @@ spec: provider: name: IBM relatedImages: - - image: icr.io/cpopen/common-service-operator:4.6.0 + - image: icr.io/cpopen/common-service-operator:4.7.0 name: COMMON_SERVICE_OPERATOR_IMAGE - - image: icr.io/cpopen/cpfs/cpfs-utils:latest - name: CPFS_UTILS_IMAGE version: 0.0.0 diff --git a/testdata/deploy/deploy.yaml b/testdata/deploy/deploy.yaml index e6c3133ef..eb29e001e 100644 --- a/testdata/deploy/deploy.yaml +++ b/testdata/deploy/deploy.yaml @@ -15,8 +15,8 @@ spec: name: ibm-common-service-operator annotations: description: The IBM Common Service Operator is used to deploy IBM Common Services - operatorChannel: v4.6 - operatorVersion: 4.6.0 + operatorChannel: v4.7 + operatorVersion: 4.7.0 cloudPakThemesVersion: styles460.css spec: affinity: diff --git a/version/version.go b/version/version.go index ec7681b87..ff8e901df 100644 --- a/version/version.go +++ b/version/version.go @@ -17,5 +17,5 @@ package version var ( - Version = "4.6.0" + Version = "4.7.0" )