Merge pull request #158 from IBM/release-1.4.1

Release 1.4.1

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.4.0" \
+  org.label-schema.schema-version="1.4.1" \
   summary="IBM Storage ODF Operator" \
   description="operator and driver of ibm storage systems for openshift data foundation (ODF)"
 

bundle/manifests/ibm-storage-odf-operator.clusterserviceversion.yaml

@@ -33,8 +33,7 @@ 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.4.0'
-  name: ibm-storage-odf-operator.v1.4.0
+    olm.skipRange: '>=0.0.1 <1.4.1'
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -319,12 +318,12 @@ spec:
                       - /manager
                     env:
                       - name: EXPORTER_IMAGE
-                        value: quay.io/ibmodffs/ibm-storage-odf-block-driver:1.4.0
+                        value: quay.io/ibmodffs/ibm-storage-odf-block-driver:1.4.1
                       - name: RESOURCES_NAMESPACE
                         valueFrom:
                           fieldRef:
                             fieldPath: metadata.annotations['olm.operatorNamespace']
-                    image: registry.connect.redhat.com/ibm/ibm-storage-odf-operator:1.4.0
+                    image: registry.connect.redhat.com/ibm/ibm-storage-odf-operator:1.4.1
                     imagePullPolicy: Always
                     livenessProbe:
                       httpGet:
@@ -376,7 +375,7 @@ spec:
                   app: ibm-odf-console
               spec:
                 containers:
-                  - image: quay.io/ibmodffs/ibm-storage-odf-plugin:1.4.0
+                  - image: quay.io/ibmodffs/ibm-storage-odf-plugin:1.4.1
                     name: ibm-odf-console
                     ports:
                       - containerPort: 9003
@@ -455,4 +454,4 @@ spec:
   maturity: alpha
   provider:
     name: IBM
-  version: 1.4.0
+  version: 1.4.1

config/console/kustomization.yaml

@@ -12,4 +12,4 @@ kind: Kustomization
 images:
   - name: ibm-console
     newName: quay.io/ibmodffs/ibm-storage-odf-plugin
-    newTag: 1.4.0
+    newTag: 1.4.1

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.4.0
+          value: quay.io/ibmodffs/ibm-storage-odf-block-driver:1.4.1

config/manager/kustomization.yaml

@@ -14,4 +14,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/ibmodffs/ibm-storage-odf-operator
-  newTag: 1.4.0
+  newTag: 1.4.1

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.4.0")
-        string(name: 'CONSOLE_GIT_BRANCH', defaultValue: "release-1.4.0")
-        string(name: 'OPERATOR_GIT_BRANCH', defaultValue: "release-1.4.0")
+        string(name: 'DRIVER_GIT_BRANCH', defaultValue: "release-1.4.1")
+        string(name: 'CONSOLE_GIT_BRANCH', defaultValue: "release-1.4.1")
+        string(name: 'OPERATOR_GIT_BRANCH', defaultValue: "release-1.4.1")
         string(name: 'PLATFORM', defaultValue: "linux/amd64")
         string(name: 'ENABLE_UPGRADE', defaultValue: "False")
     }

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.4.0-$(git rev-parse --short HEAD)"
+VCS_REF="1.4.1-$(git rev-parse --short HEAD)"
 RELEASE_VERSION=$(cat version/version.go | grep "Version =" | awk -F '"' '{print $2}')
 
 CHANNELS="stable-v1.4"
 DEFAULT_CHANNEL="${CHANNELS}"
-OPERATOR_IMAGE_VERSION="v1.4.0"
+OPERATOR_IMAGE_VERSION="v1.4.1"
 
 DEFAULT_ENABLE_UPGRADE='False'
-PREVIOUS_CHANNELS="stable-v1.3"
+PREVIOUS_CHANNELS="stable-v1.4"
 PREVIOUS_DEFAULT_CHANNEL="${PREVIOUS_CHANNELS}"
-PREVIOUS_OPERATOR_IMAGE_VERSION="v1.3.0"
-PREVIOUS_OPERATOR_IMAGE_TAG="${PREVIOUS_OPERATOR_IMAGE_VERSION:1}" #1.3.0
+PREVIOUS_OPERATOR_IMAGE_VERSION="v1.4.0"
+PREVIOUS_OPERATOR_IMAGE_TAG="${PREVIOUS_OPERATOR_IMAGE_VERSION:1}" #1.4.0
 PREVIOUS_BUNDLE_IMAGE_PATH="quay.io/ibmodffs/ibm-storage-odf-operator-bundle:${PREVIOUS_OPERATOR_IMAGE_TAG}"
 
 GO111MODULE="on"

version/version.go

@@ -18,5 +18,5 @@ package version
 
 var (
 	// Version of the operator
-	Version = "1.4.0"
+	Version = "1.4.1"
 )