Merge remote-tracking branch 'origin/release-1.3.0' into main

# Conflicts:
#	Dockerfile
#	bundle.Dockerfile
#	bundle/manifests/flashsystem-csi-cr_v1_configmap.yaml
#	bundle/manifests/ibm-storage-odf-operator.clusterserviceversion.yaml
#	bundle/metadata/annotations.yaml
#	bundle/metadata/dependencies.yaml
#	config/console/kustomization.yaml
#	config/default/manager_config_patch.yaml
#	config/manager/csi.ibm.com_v1_ibmblockcsi_cr.yaml
#	config/manager/kustomization.yaml
#	config/samples/csi-crds/csi.ibm.com_ibmblockcsis_crd.yaml
#	config/samples/csi.ibm.com_v1_ibmblockcsi_cr.yaml
#	hack/bundle-manifests.sh
#	hack/common.sh
#	hack/ensure-blockcsi-cryaml.sh
#	version/version.go

.github/workflows/codespell.yaml

@@ -18,3 +18,4 @@ jobs:
       with:
         check_filenames: true
         check_hidden: true
+        skip: "./go.sum"

.github/workflows/commitlint.yaml

@@ -1,10 +1,6 @@
 name: commitlint
 
-on:
-  push:
-    branches: [ '*' ]
-  pull_request:
-    branches: [ '*' ]
+on: workflow_dispatch
 
 jobs:
   commitlint:

.github/workflows/iso-ci.yaml

@@ -17,13 +17,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ["1.15"]
+        go: ["1.18"]
     steps:
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v3
       with:
         go-version: ${{ matrix.go }}
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
@@ -35,15 +35,16 @@ jobs:
       run: |
         make test
 
-    - name: login to Docker Hub
+    - name: login to Quay.io
       # Only if we need to push an image
       if: ${{ github.event_name == 'release' && github.event.action == 'published' }}
       uses: docker/login-action@v1
       with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
+        registry: quay.io
+        username: ${{ secrets.QUAYIO_USERNAME }}
+        password: ${{ secrets.QUAYIO_TOKEN }}
 
-    # Setup for buildx
+      # Setup for buildx
     - name: set up QEMU
       uses: docker/setup-qemu-action@v1
     - name: set up Docker Buildx
@@ -77,7 +78,7 @@ jobs:
         # Only push if we are publishing a release
         push: ${{ github.event_name == 'release' && github.event.action == 'published' }}
         # Use a 'dev' tag, that won't be pushed, for non-release builds
-        tags: docker.io/ibmcom/ibm-storage-odf-operator:${{ steps.tag.outputs.version-without-v || 'dev' }}
+        tags: quay.io/ibmodffs/ibm-storage-odf-operator:${{ steps.tag.outputs.version-without-v || 'dev' }}
 
     - name: generate bundle manifests and metadata
       run: |
@@ -93,4 +94,4 @@ jobs:
         file: ./bundle.Dockerfile
         platforms: linux/amd64,linux/ppc64le,linux/s390x
         push: ${{ github.event_name == 'release' && github.event.action == 'published' }}
-        tags: docker.io/ibmcom/ibm-storage-odf-operator-bundle:${{ steps.tag.outputs.version-without-v || 'dev' }}
+        tags: quay.io/ibmodffs/ibm-storage-odf-operator-bundle:${{ steps.tag.outputs.version-without-v || 'dev' }}

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.15 as builder
+FROM --platform=$BUILDPLATFORM golang:1.18 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -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.2.0" \
+  org.label-schema.schema-version="1.3.0" \
   summary="IBM Storage ODF Operator" \
   description="operator and driver of ibm storage systems for openshift data foundation (ODF)"
 

Makefile

@@ -138,7 +138,7 @@ TMP_DIR=$$(mktemp -d) ;\
 cd $$TMP_DIR ;\
 go mod init tmp ;\
 echo "Downloading $(2)" ;\
-GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\
+GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\
 rm -rf $$TMP_DIR ;\
 }
 endef

api/v1alpha1/condition.go

@@ -50,13 +50,13 @@ const (
 	ExporterCreated ConditionType = "ExporterCreated"
 	// ExporterReady is set from exporter and reason & message are provided if false condition
 	ExporterReady ConditionType = "ExporterReady"
-	// StorageClusterReady is set from exporter after query from flashsystem
+	// StorageClusterReady is set from exporter after query from FlashSystem
 	StorageClusterReady ConditionType = "StorageClusterReady"
-	// ProvisionerCreated indicts the flashsystem CSI CR is created
+	// ProvisionerCreated indicts the FlashSystem CSI CR is created
 	ProvisionerCreated ConditionType = "ProvisionerCreated"
-	// ProvisionerReused indicts the existing flashsystem CSI CR is reused
+	// ProvisionerReused indicts the existing FlashSystem CSI CR is reused
 	ProvisionerReused ConditionType = "ProvisionerReused"
-	// ProvisionerReady reflects the status of flashsystem CSI CR
+	// ProvisionerReady reflects the status of FlashSystem CSI CR
 	ProvisionerReady ConditionType = "ProvisionerReady"
 	// ConditionProgressing indicts the reconciling process is in progress
 	ConditionProgressing ConditionType = "ReconcileProgressing"

api/v1alpha1/flashsystemcluster_types.go

@@ -36,7 +36,7 @@ type StorageClassConfig struct {
 type FlashSystemClusterSpec struct {
 	// Name is the name of the flashsystem storage cluster
 	Name string `json:"name"`
-	// Secret refers to a secret that has the credentials for flashsystem csi storageclass
+	// Secret refers to a secret that has the credentials for FlashSystem csi StorageClass
 	Secret corev1.SecretReference `json:"secret"`
 	// InsecureSkipVerify disables target certificate validation if true
 	InsecureSkipVerify bool `json:"insecureSkipVerify,omitempty"`
@@ -68,7 +68,7 @@ type FlashSystemClusterStatus struct {
 //+kubebuilder:printcolumn:name="Phase",type=string,JSONPath=.status.phase,description="Current Phase"
 //+kubebuilder:printcolumn:name="Created At",type=string,JSONPath=.metadata.creationTimestamp
 
-// FlashSystemCluster is the Schema for the flashsystemclusters API
+// FlashSystemCluster is the Schema for the FlashSystemClusters API
 type FlashSystemCluster struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -95,7 +95,7 @@ const (
 	PhaseReady = "Ready"
 	// PhaseNotReady is used if reconcile fails
 	PhaseNotReady = "Not Ready"
-	// PhaseDeleting is used if deleting flashsystemcluster is happening
+	// PhaseDeleting is used if deleting FlashSystemCluster is happening
 	PhaseDeleting = "Deleting"
 	// PhaseConnecting is reserved for later usage
 	PhaseConnecting = "Connecting"

bundle.Dockerfile

@@ -5,10 +5,10 @@ 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.2
-LABEL operators.operatorframework.io.bundle.channel.default.v1=stable-v1.2
+LABEL operators.operatorframework.io.bundle.channels.v1=stable-v1.3
+LABEL operators.operatorframework.io.bundle.channel.default.v1=stable-v1.3
+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.builder=operator-sdk-v1.4.0+git
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 
 # Labels for testing.
@@ -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.11"
+LABEL com.redhat.openshift.versions="v4.12"
 LABEL com.redhat.delivery.operator.bundle=true

bundle/manifests/flashsystem-csi-cr_v1_configmap.yaml

@@ -1,22 +1,23 @@
+---
 apiVersion: v1
 data:
   csi.ibm.com_v1_ibmblockcsi_cr.yaml: |
     apiVersion: csi.ibm.com/v1
     kind: IBMBlockCSI
     metadata:
       name: ibm-block-csi
-      namespace: default
+      namespace: openshift-storage
       labels:
         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.10.0
+        release: v1.11.0
     spec:
       # controller is a statefulSet with ibm-block-csi-controller container
       # and csi-provisioner, csi-attacher, csi-snapshotter and livenessprobe sidecars.
       controller:
-        repository: ibmcom/ibm-block-csi-driver-controller
-        tag: "1.10.0"
+        repository: quay.io/ibmcsiblock/ibm-block-csi-driver-controller
+        tag: "1.11.0"
         imagePullPolicy: IfNotPresent
         affinity:
           nodeAffinity:
@@ -29,12 +30,12 @@ data:
                         - amd64
                         - s390x
                         - ppc64le
-    
+
       # node is a daemonSet with ibm-block-csi-node container
       # and csi-node-driver-registrar and livenessprobe sidecars.
       node:
-        repository: ibmcom/ibm-block-csi-driver-node
-        tag: "1.10.0"
+        repository: quay.io/ibmcsiblock/ibm-block-csi-driver-node
+        tag: "1.11.0"
         imagePullPolicy: IfNotPresent
         affinity:
           nodeAffinity:
@@ -47,12 +48,12 @@ data:
                         - amd64
                         - 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
@@ -75,13 +76,18 @@ data:
         tag: "v1.4.0"
         imagePullPolicy: IfNotPresent
       - name: csi-addons-replicator
-        repository: quay.io/csiaddons/volumereplication-operator
-        tag: "v0.2.0"
+        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:
     #  - "secretName"

bundle/manifests/flashsystemcluster-metrics_rbac.authorization.k8s.io_v1_role.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:

bundle/manifests/flashsystemcluster-metrics_rbac.authorization.k8s.io_v1_rolebinding.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:

bundle/manifests/ibm-storage-odf-operator-metrics-service_v1_service.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: Service
 metadata:

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

@@ -1,3 +1,4 @@
+---
 apiVersion: operators.coreos.com/v1alpha1
 kind: ClusterServiceVersion
 metadata:
@@ -28,19 +29,19 @@ metadata:
           }
         }
       ]
-    capabilities: Basic Install
+    capabilities: Seamless Upgrades
     console.openshift.io/plugins: '["ibm-storage-odf-plugin"]'
-    operators.operatorframework.io/builder: operator-sdk-v1.4.0+git
+    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.2.0'
-  name: ibm-storage-odf-operator.v1.2.0
+    olm.skipRange: '>=0.0.1 <1.3.0'
+  name: ibm-storage-odf-operator.v1.3.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
   customresourcedefinitions:
     owned:
-      - description: FlashSystemCluster is the Schema for the flashsystemclusters API
+      - description: FlashSystemCluster is the Schema for the FlashSystemClusters API
         displayName: Flash System Cluster
         kind: FlashSystemCluster
         name: flashsystemclusters.odf.ibm.com
@@ -54,6 +55,25 @@ spec:
     spec:
       clusterPermissions:
         - rules:
+            - apiGroups:
+                - ""
+              resources:
+                - persistentvolumeclaims
+              verbs:
+                - get
+                - list
+                - update
+                - watch
+            - apiGroups:
+                - ""
+              resources:
+                - persistentvolumes
+              verbs:
+                - get
+                - list
+                - patch
+                - update
+                - watch
             - apiGroups:
                 - ""
               resources:
@@ -181,6 +201,7 @@ spec:
                 - list
                 - patch
                 - update
+                - watch
             - apiGroups:
                 - monitoring.coreos.com
               resources:
@@ -259,7 +280,9 @@ spec:
                 - create
           serviceAccountName: ibm-storage-odf-operator
       deployments:
-        - name: ibm-storage-odf-operator
+        - label:
+            odf: storage.ibm.com
+          name: ibm-storage-odf-operator
           spec:
             replicas: 1
             selector:
@@ -292,12 +315,12 @@ spec:
                       - /manager
                     env:
                       - name: EXPORTER_IMAGE
-                        value: docker.io/ibmcom/ibm-storage-odf-block-driver:1.2.0
+                        value: quay.io/ibmodffs/ibm-storage-odf-block-driver:1.3.0
                       - name: WATCH_NAMESPACE
                         valueFrom:
                           fieldRef:
-                            fieldPath: metadata.annotations['olm.targetNamespaces']
-                    image: docker.io/ibmcom/ibm-storage-odf-operator:1.2.0
+                            fieldPath: metadata.annotations['olm.operatorNamespace']
+                    image: registry.connect.redhat.com/ibm/ibm-storage-odf-operator:1.3.0
                     imagePullPolicy: Always
                     livenessProbe:
                       httpGet:
@@ -332,7 +355,9 @@ spec:
                   - configMap:
                       name: flashsystem-csi-cr
                     name: manager-config
-        - name: ibm-odf-console
+        - label:
+            app: ibm-odf-console
+          name: ibm-odf-console
           spec:
             selector:
               matchLabels:
@@ -344,7 +369,7 @@ spec:
                   app: ibm-odf-console
               spec:
                 containers:
-                  - image: docker.io/ibmcom/ibm-storage-odf-plugin:1.2.0
+                  - image: quay.io/ibmodffs/ibm-storage-odf-plugin:1.3.0
                     name: ibm-odf-console
                     ports:
                       - containerPort: 9003
@@ -416,4 +441,4 @@ spec:
   maturity: alpha
   provider:
     name: IBM
-  version: 1.2.0
+  version: 1.3.0

bundle/manifests/metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata: