Merge branch 'release-1.5.0' into main

.github/workflows/codespell.yaml

@@ -11,11 +11,12 @@ jobs:
     name: codespell
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: codespell
       uses: codespell-project/actions-codespell@v1
       with:
         check_filenames: true
         check_hidden: true
-        skip: "./go.sum"
+        skip: "./go.sum"
+        ignore_words_list: NotIn

.github/workflows/golangci-lint.yaml

@@ -11,10 +11,10 @@ jobs:
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: golangci-lint
-      uses: golangci/golangci-lint-action@v2
+      uses: golangci/golangci-lint-action@v6
       with:
         # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
         version: latest

.github/workflows/iso-ci.yaml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ["1.18"]
+        go: ["1.19"]
     steps:
     - uses: actions/setup-go@v3
       with:

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.18 as builder
+FROM --platform=$BUILDPLATFORM golang:1.20 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -19,7 +19,7 @@ COPY console/ console/
 RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -o manager main.go
 
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
+FROM registry.access.redhat.com/ubi9-minimal:9.4-1134
 MAINTAINER IBM Storage
 
 RUN microdnf update -y && microdnf clean all
@@ -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.1" \
+  org.label-schema.schema-version="1.5.0" \
   summary="IBM Storage ODF Operator" \
   description="operator and driver of ibm storage systems for openshift data foundation (ODF)"
 

api/v1alpha1/groupversion_info.go

@@ -15,8 +15,8 @@
  */
 
 // Package v1alpha1 contains API Schema definitions for the odf v1alpha1 API group
-//+kubebuilder:object:generate=true
-//+groupName=odf.ibm.com
+// +kubebuilder:object:generate=true
+// +groupName=odf.ibm.com
 package v1alpha1
 
 import (

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.4
-LABEL operators.operatorframework.io.bundle.channel.default.v1=stable-v1.4
+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.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.13"
+LABEL com.redhat.openshift.versions="v4.14"
 LABEL com.redhat.delivery.operator.bundle=true

bundle/manifests/flashsystem-csi-cr_v1_configmap.yaml

@@ -10,13 +10,13 @@ data:
         app.kubernetes.io/name: ibm-block-csi
         app.kubernetes.io/instance: ibm-block-csi
         app.kubernetes.io/managed-by: ibm-block-csi-operator
-        release: v1.11.1
+        release: v1.11.3
     spec:
       # controller is a statefulSet with ibm-block-csi-controller container
       # and csi-provisioner, csi-attacher, csi-snapshotter and livenessprobe sidecars.
       controller:
-        repository: stg-artifactory.xiv.ibm.com:5030/ibm-block-csi-driver-controller-amd64
-        tag: "latest"
+        repository: quay.io/ibmcsiblock/ibm-block-csi-driver-controller
+        tag: "1.11.2"
         imagePullPolicy: IfNotPresent
         affinity:
           nodeAffinity:
@@ -33,8 +33,8 @@ data:
       # node is a daemonSet with ibm-block-csi-node container
       # and csi-node-driver-registrar and livenessprobe sidecars.
       node:
-        repository: stg-artifactory.xiv.ibm.com:5030/ibm-block-csi-driver-node-amd64
-        tag: "latest"
+        repository: quay.io/ibmcsiblock/ibm-block-csi-driver-node
+        tag: "1.11.2"
         imagePullPolicy: IfNotPresent
         affinity:
           nodeAffinity:
@@ -56,35 +56,35 @@ data:
       sidecars:
       - name: csi-node-driver-registrar
         repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
-        tag: "v2.5.0"
+        tag: "v2.6.3"
         imagePullPolicy: IfNotPresent
       - name: csi-provisioner
         repository: k8s.gcr.io/sig-storage/csi-provisioner
-        tag: "v3.1.0"
+        tag: "v3.4.0"
         imagePullPolicy: IfNotPresent
       - name: csi-attacher
         repository: k8s.gcr.io/sig-storage/csi-attacher
-        tag: "v3.4.0"
+        tag: "v4.2.0"
         imagePullPolicy: IfNotPresent
       - name: csi-snapshotter
         repository: k8s.gcr.io/sig-storage/csi-snapshotter
-        tag: "v5.0.1"
+        tag: "v6.2.1"
         imagePullPolicy: IfNotPresent
       - name: csi-resizer
         repository: k8s.gcr.io/sig-storage/csi-resizer
-        tag: "v1.4.0"
+        tag: "v1.7.0"
         imagePullPolicy: IfNotPresent
       - name: csi-addons-replicator
         repository: quay.io/ibmcsiblock/csi-block-volumereplication-operator
         tag: "v0.9.0"
         imagePullPolicy: IfNotPresent
       - name: csi-volume-group
         repository: quay.io/ibmcsiblock/csi-volume-group-operator
-        tag: "v0.9.0"
+        tag: "v0.9.1"
         imagePullPolicy: IfNotPresent
       - name: livenessprobe
         repository: k8s.gcr.io/sig-storage/livenessprobe
-        tag: "v2.6.0"
+        tag: "v2.9.0"
         imagePullPolicy: IfNotPresent
 
     #  healthPort: 9808

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

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

bundle/manifests/odf.ibm.com_flashsystemclusters.yaml

@@ -85,11 +85,11 @@ spec:
                   FlashSystem csi StorageClass
                 properties:
                   name:
-                    description: Name is unique within a namespace to reference a
+                    description: name is unique within a namespace to reference a
                       secret resource.
                     type: string
                   namespace:
-                    description: Namespace defines the space within which the secret
+                    description: namespace defines the space within which the secret
                       name must be unique.
                     type: string
                 type: object

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.4
-  operators.operatorframework.io.bundle.channel.default.v1: stable-v1.4
+  operators.operatorframework.io.bundle.channels.v1: stable-v1.5
+  operators.operatorframework.io.bundle.channel.default.v1: stable-v1.5
   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
+  com.redhat.openshift.versions: v4.13-v4.14

bundle/metadata/dependencies.yaml

@@ -2,4 +2,4 @@ dependencies:
   - type: olm.package
     value:
       packageName: ibm-block-csi-operator
-      version: ">=1.11.1"
+      version: "=1.11.3"

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.1
+    newTag: 1.5.0

config/crd/bases/odf.ibm.com_flashsystemclusters.yaml

@@ -87,11 +87,11 @@ spec:
                   FlashSystem csi StorageClass
                 properties:
                   name:
-                    description: Name is unique within a namespace to reference a
+                    description: name is unique within a namespace to reference a
                       secret resource.
                     type: string
                   namespace:
-                    description: Namespace defines the space within which the secret
+                    description: namespace defines the space within which the secret
                       name must be unique.
                     type: string
                 type: object

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

config/manager/csi.ibm.com_v1_ibmblockcsi_cr.yaml

@@ -7,13 +7,13 @@ metadata:
     app.kubernetes.io/name: ibm-block-csi
     app.kubernetes.io/instance: ibm-block-csi
     app.kubernetes.io/managed-by: ibm-block-csi-operator
-    release: v1.11.1
+    release: v1.11.3
 spec:
   # controller is a statefulSet with ibm-block-csi-controller container
   # and csi-provisioner, csi-attacher, csi-snapshotter and livenessprobe sidecars.
   controller:
-    repository: stg-artifactory.xiv.ibm.com:5030/ibm-block-csi-driver-controller-amd64
-    tag: "latest"
+    repository: quay.io/ibmcsiblock/ibm-block-csi-driver-controller
+    tag: "1.11.2"
     imagePullPolicy: IfNotPresent
     affinity:
       nodeAffinity:
@@ -30,8 +30,8 @@ spec:
   # node is a daemonSet with ibm-block-csi-node container
   # and csi-node-driver-registrar and livenessprobe sidecars.
   node:
-    repository: stg-artifactory.xiv.ibm.com:5030/ibm-block-csi-driver-node-amd64
-    tag: "latest"
+    repository: quay.io/ibmcsiblock/ibm-block-csi-driver-node
+    tag: "1.11.2"
     imagePullPolicy: IfNotPresent
     affinity:
       nodeAffinity:
@@ -45,44 +45,44 @@ spec:
                     - s390x
                     - ppc64le
 
-#    tolerations:
-#    - effect: NoSchedule
-#      key: node-role.kubernetes.io/master
-#      operator: Exists
+  #    tolerations:
+  #    - effect: NoSchedule
+  #      key: node-role.kubernetes.io/master
+  #      operator: Exists
 
   sidecars:
-  - name: csi-node-driver-registrar
-    repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
-    tag: "v2.5.0"
-    imagePullPolicy: IfNotPresent
-  - name: csi-provisioner
-    repository: k8s.gcr.io/sig-storage/csi-provisioner
-    tag: "v3.1.0"
-    imagePullPolicy: IfNotPresent
-  - name: csi-attacher
-    repository: k8s.gcr.io/sig-storage/csi-attacher
-    tag: "v3.4.0"
-    imagePullPolicy: IfNotPresent
-  - name: csi-snapshotter
-    repository: k8s.gcr.io/sig-storage/csi-snapshotter
-    tag: "v5.0.1"
-    imagePullPolicy: IfNotPresent
-  - name: csi-resizer
-    repository: k8s.gcr.io/sig-storage/csi-resizer
-    tag: "v1.4.0"
-    imagePullPolicy: IfNotPresent
-  - name: csi-addons-replicator
-    repository: quay.io/ibmcsiblock/csi-block-volumereplication-operator
-    tag: "v0.9.0"
-    imagePullPolicy: IfNotPresent
-  - name: csi-volume-group
-    repository: quay.io/ibmcsiblock/csi-volume-group-operator
-    tag: "v0.9.0"
-    imagePullPolicy: IfNotPresent
-  - name: livenessprobe
-    repository: k8s.gcr.io/sig-storage/livenessprobe
-    tag: "v2.6.0"
-    imagePullPolicy: IfNotPresent
+    - name: csi-node-driver-registrar
+      repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
+      tag: "v2.5.0"
+      imagePullPolicy: IfNotPresent
+    - name: csi-provisioner
+      repository: k8s.gcr.io/sig-storage/csi-provisioner
+      tag: "v3.1.0"
+      imagePullPolicy: IfNotPresent
+    - name: csi-attacher
+      repository: k8s.gcr.io/sig-storage/csi-attacher
+      tag: "v3.4.0"
+      imagePullPolicy: IfNotPresent
+    - name: csi-snapshotter
+      repository: k8s.gcr.io/sig-storage/csi-snapshotter
+      tag: "v5.0.1"
+      imagePullPolicy: IfNotPresent
+    - name: csi-resizer
+      repository: k8s.gcr.io/sig-storage/csi-resizer
+      tag: "v1.4.0"
+      imagePullPolicy: IfNotPresent
+    - name: csi-addons-replicator
+      repository: quay.io/ibmcsiblock/csi-block-volumereplication-operator
+      tag: "v0.9.0"
+      imagePullPolicy: IfNotPresent
+    - name: csi-volume-group
+      repository: quay.io/ibmcsiblock/csi-volume-group-operator
+      tag: "v0.9.0"
+      imagePullPolicy: IfNotPresent
+    - name: livenessprobe
+      repository: k8s.gcr.io/sig-storage/livenessprobe
+      tag: "v2.6.0"
+      imagePullPolicy: IfNotPresent
 
 #  healthPort: 9808
 #  imagePullSecrets:

config/manager/kustomization.yaml

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