From 60f15fa7cfdf36703c33eea1447e489762ec3343 Mon Sep 17 00:00:00 2001 From: Uri Ziv Date: Wed, 17 Jul 2024 11:31:27 +0300 Subject: [PATCH] Trail bump 1.6.0 --- Dockerfile | 2 +- bundle.Dockerfile | 6 +++--- ...m-storage-odf-operator.clusterserviceversion.yaml | 12 ++++++------ bundle/metadata/annotations.yaml | 6 +++--- config/console/kustomization.yaml | 2 +- config/default/manager_config_patch.yaml | 2 +- config/manager/kustomization.yaml | 2 +- console/console.go | 2 +- hack/Jenkinsfile | 6 +++--- hack/bundle-manifests.sh | 2 +- hack/common.sh | 12 ++++++------ version/version.go | 2 +- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Dockerfile b/Dockerfile index b9f1c053..cba2ab19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,7 +33,7 @@ LABEL vendor="IBM" \ org.label-schema.name="ibm storage odf operator" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-url=$VCS_URL \ - org.label-schema.schema-version="1.5.0" \ + org.label-schema.schema-version="1.6.0" \ summary="IBM Storage ODF Operator" \ description="operator and driver of ibm storage systems for openshift data foundation (ODF)" diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 914dc58b..35fd7cc2 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-storage-odf-operator -LABEL operators.operatorframework.io.bundle.channels.v1=stable-v1.5 -LABEL operators.operatorframework.io.bundle.channel.default.v1=stable-v1.5 +LABEL operators.operatorframework.io.bundle.channels.v1=stable-v1.6 +LABEL operators.operatorframework.io.bundle.channel.default.v1=stable-v1.6 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.25.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 @@ -19,5 +19,5 @@ LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/ COPY bundle/manifests /manifests/ COPY bundle/metadata /metadata/ COPY bundle/tests/scorecard /tests/scorecard/ -LABEL com.redhat.openshift.versions="v4.14" +LABEL com.redhat.openshift.versions="v4.15" LABEL com.redhat.delivery.operator.bundle=true diff --git a/bundle/manifests/ibm-storage-odf-operator.clusterserviceversion.yaml b/bundle/manifests/ibm-storage-odf-operator.clusterserviceversion.yaml index efe0849e..2ed7bd2d 100644 --- a/bundle/manifests/ibm-storage-odf-operator.clusterserviceversion.yaml +++ b/bundle/manifests/ibm-storage-odf-operator.clusterserviceversion.yaml @@ -33,8 +33,8 @@ metadata: operators.operatorframework.io/builder: operator-sdk-v1.25.0 operators.operatorframework.io/operator-type: non-standalone operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 - olm.skipRange: '>=0.0.1 <1.5.0' - name: ibm-storage-odf-operator.v1.5.0 + olm.skipRange: '>=0.0.1 <1.6.0' + name: ibm-storage-odf-operator.v1.6.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -319,12 +319,12 @@ spec: - /manager env: - name: EXPORTER_IMAGE - value: quay.io/ibmodffs/ibm-storage-odf-block-driver:1.5.0 + value: quay.io/ibmodffs/ibm-storage-odf-block-driver:1.6.0 - name: RESOURCES_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.annotations['olm.operatorNamespace'] - image: registry.connect.redhat.com/ibm/ibm-storage-odf-operator:1.5.0 + image: registry.connect.redhat.com/ibm/ibm-storage-odf-operator:1.6.0 imagePullPolicy: Always livenessProbe: httpGet: @@ -376,7 +376,7 @@ spec: app: ibm-odf-console spec: containers: - - image: quay.io/ibmodffs/ibm-storage-odf-plugin:1.5.0 + - image: quay.io/ibmodffs/ibm-storage-odf-plugin:1.6.0 name: ibm-odf-console ports: - containerPort: 9003 @@ -455,4 +455,4 @@ spec: maturity: alpha provider: name: IBM - version: 1.5.0 + version: 1.6.0 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index a411b290..f1da6387 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-storage-odf-operator - operators.operatorframework.io.bundle.channels.v1: stable-v1.5 - operators.operatorframework.io.bundle.channel.default.v1: stable-v1.5 + operators.operatorframework.io.bundle.channels.v1: stable-v1.6 + operators.operatorframework.io.bundle.channel.default.v1: stable-v1.6 operators.operatorframework.io.metrics.builder: operator-sdk-v1.25.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 @@ -15,4 +15,4 @@ annotations: operators.operatorframework.io.test.config.v1: tests/scorecard/ # OpenShift annotations: - com.redhat.openshift.versions: v4.13-v4.14 + com.redhat.openshift.versions: =v4.15 diff --git a/config/console/kustomization.yaml b/config/console/kustomization.yaml index df9833ae..ef67aa99 100644 --- a/config/console/kustomization.yaml +++ b/config/console/kustomization.yaml @@ -12,4 +12,4 @@ kind: Kustomization images: - name: ibm-console newName: quay.io/ibmodffs/ibm-storage-odf-plugin - newTag: 1.5.0 + newTag: 1.6.0 diff --git a/config/default/manager_config_patch.yaml b/config/default/manager_config_patch.yaml index 3a535d6b..9eb4f1d5 100644 --- a/config/default/manager_config_patch.yaml +++ b/config/default/manager_config_patch.yaml @@ -10,4 +10,4 @@ spec: - name: manager env: - name: EXPORTER_IMAGE - value: quay.io/ibmodffs/ibm-storage-odf-block-driver:1.5.0 + value: quay.io/ibmodffs/ibm-storage-odf-block-driver:1.6.0 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index aaadeaca..5e5ee30e 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -14,4 +14,4 @@ kind: Kustomization images: - name: controller newName: quay.io/ibmodffs/ibm-storage-odf-operator - newTag: 1.5.0 + newTag: 1.6.0 diff --git a/console/console.go b/console/console.go index 3577ee16..cd9a7d74 100644 --- a/console/console.go +++ b/console/console.go @@ -112,7 +112,7 @@ func RemoveConsole(client client.Client, namespace string) error { return nil } func GetBasePath(clusterVersion string) string { - if strings.Contains(clusterVersion, "4.14") { + if strings.Contains(clusterVersion, "4.15") { return CompatibilityBasePath } diff --git a/hack/Jenkinsfile b/hack/Jenkinsfile index 75fb364f..91a51fbd 100644 --- a/hack/Jenkinsfile +++ b/hack/Jenkinsfile @@ -9,9 +9,9 @@ pipeline { } parameters { string(name: 'DOCKER_REGISTRY', defaultValue: "stg-artifactory.xiv.ibm.com:5030") - string(name: 'DRIVER_GIT_BRANCH', defaultValue: "release-1.5.0") - string(name: 'CONSOLE_GIT_BRANCH', defaultValue: "release-1.5.0") - string(name: 'OPERATOR_GIT_BRANCH', defaultValue: "release-1.5.0") + string(name: 'DRIVER_GIT_BRANCH', defaultValue: "release-1.6.0") + string(name: 'CONSOLE_GIT_BRANCH', defaultValue: "release-1.6.0") + string(name: 'OPERATOR_GIT_BRANCH', defaultValue: "release-1.6.0") string(name: 'PLATFORM', defaultValue: "linux/amd64") string(name: 'ENABLE_UPGRADE', defaultValue: "False") } diff --git a/hack/bundle-manifests.sh b/hack/bundle-manifests.sh index 703dda6c..c3d2cc3e 100755 --- a/hack/bundle-manifests.sh +++ b/hack/bundle-manifests.sh @@ -67,5 +67,5 @@ echo "Updating the olm.skipRange for new release version ${RELEASE_VERSION}..." ${YQ_BIN} eval -i ".metadata.annotations.\"olm.skipRange\" = \">=0.0.1 <${RELEASE_VERSION}\"" "${CSV_PATH}" echo "add certification required labels to bundle.Dockerfile" -echo "LABEL com.redhat.openshift.versions=\"v4.13-v4.14\"" >> ./bundle.Dockerfile +echo "LABEL com.redhat.openshift.versions=\"v4.15\"" >> ./bundle.Dockerfile echo "LABEL com.redhat.delivery.operator.bundle=true" >> ./bundle.Dockerfile diff --git a/hack/common.sh b/hack/common.sh index 4ccbeb61..485f0630 100755 --- a/hack/common.sh +++ b/hack/common.sh @@ -43,18 +43,18 @@ CSI_VOLUME_GROUP_OPERATOR_DEVELOP_PATH="quay.io\/csiblock\/volume-group-operator CSI_VOLUME_GROUP_OPERATOR_TAG="v0.9.1" VCS_URL="https://github.com/IBM/ibm-storage-odf-operator" -VCS_REF="1.5.0-$(git rev-parse --short HEAD)" +VCS_REF="1.6.0-$(git rev-parse --short HEAD)" RELEASE_VERSION=$(cat version/version.go | grep "Version =" | awk -F '"' '{print $2}') -CHANNELS="stable-v1.5" +CHANNELS="stable-v1.6" DEFAULT_CHANNEL="${CHANNELS}" -OPERATOR_IMAGE_VERSION="v1.5.0" +OPERATOR_IMAGE_VERSION="v1.6.0" DEFAULT_ENABLE_UPGRADE='False' -PREVIOUS_CHANNELS="stable-v1.4" +PREVIOUS_CHANNELS="stable-v1.5" PREVIOUS_DEFAULT_CHANNEL="${PREVIOUS_CHANNELS}" -PREVIOUS_OPERATOR_IMAGE_VERSION="v1.4.1" -PREVIOUS_OPERATOR_IMAGE_TAG="${PREVIOUS_OPERATOR_IMAGE_VERSION:1}" #1.4.1 +PREVIOUS_OPERATOR_IMAGE_VERSION="v1.5.0" +PREVIOUS_OPERATOR_IMAGE_TAG="${PREVIOUS_OPERATOR_IMAGE_VERSION:1}" #1.5.0 PREVIOUS_BUNDLE_IMAGE_PATH="quay.io/ibmodffs/ibm-storage-odf-operator-bundle:${PREVIOUS_OPERATOR_IMAGE_TAG}" GO111MODULE="on" diff --git a/version/version.go b/version/version.go index a6ee3fdf..9c4b3dd2 100644 --- a/version/version.go +++ b/version/version.go @@ -18,5 +18,5 @@ package version var ( // Version of the operator - Version = "1.5.0" + Version = "1.6.0" )