Patch 1.6.1 Without yaml lint fixes

Dockerfile

@@ -48,7 +48,7 @@ LABEL vendor="Dell Inc." \
     name="dell-csm-operator" \
     summary="Operator for installing Dell CSI Drivers and Dell CSM Modules" \
     description="Common Operator for installing various Dell CSI Drivers and Dell CSM Modules" \
-    version="1.6.0" \
+    version="1.6.1" \
     license="Dell CSM Operator Apache License"
 
 # copy the licenses folder

Makefile

@@ -208,7 +208,7 @@ OPM = $(shell which opm)
 endif
 endif
 
-# A comma-separated list of bundle images (e.g. make catalog-build BUNDLE_IMGS=example.com/operator-bundle:v0.1.0,example.com/operator-bundle:v1.6.0).
+# A comma-separated list of bundle images (e.g. make catalog-build BUNDLE_IMGS=example.com/operator-bundle:v0.1.0,example.com/operator-bundle:v1.6.1).
 # These images MUST exist in a registry and be pull-able.
 BUNDLE_IMGS ?= $(BUNDLE_IMG)
 

bundle/manifests/dell-csm-operator.clusterserviceversion.yaml

@@ -822,10 +822,10 @@ metadata:
                     "value": "debug"
                   }
                 ],
-                "image": "dellemc/csi-powerstore:v2.11.0",
+                "image": "dellemc/csi-powerstore:v2.11.1",
                 "imagePullPolicy": "IfNotPresent"
               },
-              "configVersion": "v2.11.0",
+              "configVersion": "v2.11.1",
               "controller": {
                 "envs": [
                   {
@@ -1011,10 +1011,10 @@ metadata:
                     "value": "true"
                   }
                 ],
-                "image": "dellemc/csi-unity:v2.11.0",
+                "image": "dellemc/csi-unity:v2.11.1",
                 "imagePullPolicy": "IfNotPresent"
               },
-              "configVersion": "v2.11.0",
+              "configVersion": "v2.11.1",
               "controller": {
                 "envs": [
                   {
@@ -1460,7 +1460,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/dell/csm-operator
     support: Dell Technologies
-  name: dell-csm-operator.v1.6.0
+  name: dell-csm-operator.v1.6.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -3416,7 +3416,9 @@ spec:
     Drivers\n*\tResiliency - Designed to make Kubernetes applications more resilient
     to \n  node failures\n\nThese modules are available for various storage platforms
     in the Dell portfolio, \nsuch as Dell PowerStore, Dell PowerMax, Dell PowerFlex,
-    Dell PowerScale, and Dell Unity XT.\n\nFor more information, visit [Dell’s Container
+    Dell PowerScale, and Dell Unity XT.\n\n### Supported Openshift Platforms\n\nQualified Openshift versions for CSM Operator v1.6.0: 4.15-4.16
+    \nQualified Openshift versions for CSM Operator v1.5.1: 4.13-4.15
+    \n\nFor more information, visit [Dell’s Container
     Storage Module web page](https://www.dell.com/en-us/dt/solutions/kubernetes-containers/kubernetes-storage.htm)\n\nAdditional
     Materials\n*\t[CSM Operator GitHub Page](https://dell.github.io/csm-docs/docs/deployment/csmoperator/)\n*\t[CSM
     Introduction Video](https://www.youtube.com/watch?v=NtNSKdF9Iyo)\n*\t[CSM Solution
@@ -3430,12 +3432,6 @@ spec:
     spec:
       clusterPermissions:
       - rules:
-        - apiGroups:
-          - '*'
-          resources:
-          - '*'
-          verbs:
-          - '*'
         - nonResourceURLs:
           - /metrics
           verbs:
@@ -4585,7 +4581,7 @@ spec:
           template:
             metadata:
               annotations:
-                storage.dell.com/CSMVersion: v1.11.0
+                storage.dell.com/CSMVersion: v1.11.1
               labels:
                 control-plane: controller-manager
             spec:
@@ -4610,17 +4606,17 @@ spec:
                 - /manager
                 env:
                 - name: RELATED_IMAGE_dell-csm-operator
-                  value: docker.io/dellemc/dell-csm-operator:v1.6.0
+                  value: docker.io/dellemc/dell-csm-operator:v1.6.1
                 - name: RELATED_IMAGE_csi-isilon
                   value: docker.io/dellemc/csi-isilon:v2.11.0
                 - name: RELATED_IMAGE_csi-powermax
                   value: docker.io/dellemc/csi-powermax:v2.11.0
                 - name: RELATED_IMAGE_csipowermax-reverseproxy
                   value: docker.io/dellemc/csipowermax-reverseproxy:v2.10.0
                 - name: RELATED_IMAGE_csi-powerstore
-                  value: docker.io/dellemc/csi-powerstore:v2.11.0
+                  value: docker.io/dellemc/csi-powerstore:v2.11.1
                 - name: RELATED_IMAGE_csi-unity
-                  value: docker.io/dellemc/csi-unity:v2.11.0
+                  value: docker.io/dellemc/csi-unity:v2.11.1
                 - name: RELATED_IMAGE_csi-vxflexos
                   value: docker.io/dellemc/csi-vxflexos:v2.11.0
                 - name: RELATED_IMAGE_sdc
@@ -4732,9 +4728,9 @@ spec:
     name: csi-powermax
   - image: docker.io/dellemc/csipowermax-reverseproxy:v2.10.0
     name: csipowermax-reverseproxy
-  - image: docker.io/dellemc/csi-powerstore:v2.11.0
+  - image: docker.io/dellemc/csi-powerstore:v2.11.1
     name: csi-powerstore
-  - image: docker.io/dellemc/csi-unity:v2.11.0
+  - image: docker.io/dellemc/csi-unity:v2.11.1
     name: csi-unity
   - image: docker.io/dellemc/csi-vxflexos:v2.11.0
     name: csi-vxflexos
@@ -4779,5 +4775,5 @@ spec:
   - image: docker.io/dellemc/connectivity-cert-persister-k8s:0.11.0
     name: cert-persister
   skips:
-  - dell-csm-operator.v1.5.1
+  - dell-csm-operator.v1.6.0
   version: 1.6.0

bundle/metadata/annotations.yaml

@@ -15,4 +15,4 @@ annotations:
   operators.operatorframework.io.test.config.v1: tests/scorecard/
 
   # Annotations to specify supported OCP versions.
-  com.redhat.openshift.versions: v4.15-v4.16
+  com.redhat.openshift.versions: "v4.15-v4.16"

config/install/kustomization.yaml

@@ -14,4 +14,4 @@ bases:
 images:
   - name: controller
     newName: docker.io/dellemc/dell-csm-operator
-    newTag: v1.6.0
+    newTag: v1.6.1

config/manager/kustomization.yaml

@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: docker.io/dellemc/dell-csm-operator
-  newTag: v1.6.0
+  newTag: v1.6.1

config/manager/manager.yaml

@@ -15,7 +15,7 @@ spec:
       labels:
         control-plane: controller-manager
       annotations:
-        storage.dell.com/CSMVersion: v1.11.0
+        storage.dell.com/CSMVersion: v1.11.1
     spec:
       serviceAccountName: manager-service-account
       securityContext:
@@ -29,17 +29,17 @@ spec:
         imagePullPolicy:  Always
         name: manager
         env:
-        - value: docker.io/dellemc/dell-csm-operator:v1.6.0
+        - value: docker.io/dellemc/dell-csm-operator:v1.6.1
           name: RELATED_IMAGE_dell-csm-operator
         - value: docker.io/dellemc/csi-isilon:v2.11.0
           name: RELATED_IMAGE_csi-isilon
         - value: docker.io/dellemc/csi-powermax:v2.11.0
           name: RELATED_IMAGE_csi-powermax
         - value: docker.io/dellemc/csipowermax-reverseproxy:v2.10.0
           name: RELATED_IMAGE_csipowermax-reverseproxy
-        - value: docker.io/dellemc/csi-powerstore:v2.11.0
+        - value: docker.io/dellemc/csi-powerstore:v2.11.1
           name: RELATED_IMAGE_csi-powerstore
-        - value: docker.io/dellemc/csi-unity:v2.11.0
+        - value: docker.io/dellemc/csi-unity:v2.11.1
           name: RELATED_IMAGE_csi-unity
         - value: docker.io/dellemc/csi-vxflexos:v2.11.0
           name: RELATED_IMAGE_csi-vxflexos

config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml

@@ -5,7 +5,7 @@ metadata:
     alm-examples: '[]'
     capabilities: Seamless Upgrades
     categories: Storage
-    containerImage: docker.io/dellemc/dell-csm-operator:v1.6.0
+    containerImage: docker.io/dellemc/dell-csm-operator:v1.6.1
     createdAt: "2022-03-29T11:59:59Z"
     description: Easily install and manage Dell’s CSI Drivers and CSM
     features.operators.openshift.io/disconnected: "true"
@@ -17,7 +17,7 @@ metadata:
     features.operators.openshift.io/token-auth-gcp: "false"
     repository: https://github.com/dell/csm-operator
     support: Dell Technologies
-  name: dell-csm-operator.v1.6.0
+  name: dell-csm-operator.v1.6.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -2018,17 +2018,17 @@ spec:
     name: Dell Technologies
     url: https://github.com/dell/csm-operator
   relatedImages:
-  - image: docker.io/dellemc/dell-csm-operator:v1.6.0
+  - image: docker.io/dellemc/dell-csm-operator:v1.6.1
     name: dell-csm-operator
   - image: docker.io/dellemc/csi-isilon:v2.11.0
     name: csi-isilon
   - image: docker.io/dellemc/csi-powermax:v2.11.0
     name: csi-powermax
   - image: docker.io/dellemc/csipowermax-reverseproxy:v2.10.0
     name: csipowermax-reverseproxy
-  - image: docker.io/dellemc/csi-powerstore:v2.11.0
+  - image: docker.io/dellemc/csi-powerstore:v2.11.1
     name: csi-powerstore
-  - image: docker.io/dellemc/csi-unity:v2.11.0
+  - image: docker.io/dellemc/csi-unity:v2.11.1
     name: csi-unity
   - image: docker.io/dellemc/csi-vxflexos:v2.11.0
     name: csi-vxflexos
@@ -2074,4 +2074,4 @@ spec:
     name: cert-persister
   skips:
   - dell-csm-operator.v1.5.1
-  version: 1.6.0
+  version: 1.6.1

config/samples/storage_v1_csm_powerstore.yaml

@@ -31,7 +31,7 @@ spec:
       #   true: enable storage capacity tracking
       #   false: disable storage capacity tracking
       storageCapacity: true
-    configVersion: v2.11.0
+    configVersion: v2.11.1
     # authSecret: This is the secret used to validate the default PowerStore secret used for installation
     # Allowed values: <metadataName specified in the Manifest>-config
     # For example: If the metadataName is set to powerstore, authSecret value should be set to powerstore-config
@@ -42,7 +42,7 @@ spec:
     forceUpdate: false
     forceRemoveDriver: true
     common:
-      image: "dellemc/csi-powerstore:v2.11.0"
+      image: "dellemc/csi-powerstore:v2.11.1"
       imagePullPolicy: IfNotPresent
       envs:
         - name: X_CSI_POWERSTORE_NODE_NAME_PREFIX

config/samples/storage_v1_csm_unity.yaml

@@ -16,14 +16,14 @@ spec:
       #   true: enable storage capacity tracking
       #   false: disable storage capacity tracking
       storageCapacity: true
-    configVersion: v2.11.0
+    configVersion: v2.11.1
     # Controller count
     replicas: 2
     dnsPolicy: ClusterFirstWithHostNet
     forceUpdate: false
     forceRemoveDriver: true
     common:
-      image: "dellemc/csi-unity:v2.11.0"
+      image: "dellemc/csi-unity:v2.11.1"
       imagePullPolicy: IfNotPresent
       envs:
         # X_CSI_UNITY_ALLOW_MULTI_POD_ACCESS - Flag to enable sharing of volumes across multiple pods within the same node in RWO access mode.

controllers/csm_controller.go

@@ -93,7 +93,7 @@ const (
 	CSMFinalizerName = "finalizer.dell.emc.com"
 
 	// CSMVersion -
-	CSMVersion = "v1.11.0"
+	CSMVersion = "v1.11.1"
 )
 
 var (

deploy/olm/operator_community.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: test-csm-operator-olm
 spec:
   sourceType: grpc
-  image: docker.io/dellemc/dell-csm-operator:v1.6.0
+  image: docker.io/dellemc/dell-csm-operator:v1.6.1
 ---
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup

deploy/operator.yaml

@@ -1328,7 +1328,7 @@ spec:
   template:
     metadata:
       annotations:
-        storage.dell.com/CSMVersion: v1.11.0
+        storage.dell.com/CSMVersion: v1.11.1
       labels:
         control-plane: controller-manager
     spec:
@@ -1339,17 +1339,17 @@ spec:
         - /manager
         env:
         - name: RELATED_IMAGE_dell-csm-operator
-          value: docker.io/dellemc/dell-csm-operator:v1.6.0
+          value: docker.io/dellemc/dell-csm-operator:v1.6.1
         - name: RELATED_IMAGE_csi-isilon
           value: docker.io/dellemc/csi-isilon:v2.11.0
         - name: RELATED_IMAGE_csi-powermax
           value: docker.io/dellemc/csi-powermax:v2.11.0
         - name: RELATED_IMAGE_csipowermax-reverseproxy
           value: docker.io/dellemc/csipowermax-reverseproxy:v2.10.0
         - name: RELATED_IMAGE_csi-powerstore
-          value: docker.io/dellemc/csi-powerstore:v2.11.0
+          value: docker.io/dellemc/csi-powerstore:v2.11.1
         - name: RELATED_IMAGE_csi-unity
-          value: docker.io/dellemc/csi-unity:v2.11.0
+          value: docker.io/dellemc/csi-unity:v2.11.1
         - name: RELATED_IMAGE_csi-vxflexos
           value: docker.io/dellemc/csi-vxflexos:v2.11.0
         - name: RELATED_IMAGE_sdc
@@ -1392,7 +1392,7 @@ spec:
           value: docker.io/dellemc/connectivity-client-docker-k8s:1.19.0
         - name: RELATED_IMAGE_cert-persister
           value: docker.io/dellemc/connectivity-cert-persister-k8s:0.11.0
-        image: docker.io/dellemc/dell-csm-operator:v1.6.0
+        image: docker.io/dellemc/dell-csm-operator:v1.6.1
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

docker.mk

@@ -14,11 +14,11 @@ BUNDLE_IMAGE_TAG_BASE_COMMUNITY ?= dell-csm-community-operator-bundle
 # Image tag base for community catalog images
 CATALOG_IMAGE_TAG_BASE_COMMUNITY ?= dell-csm-community-operator-catalog
 
-# Operator version tagged with build number. For e.g. - v1.6.0.001
-VERSION ?= v1.6.0
+# Operator version tagged with build number. For e.g. - v1.6.1.001
+VERSION ?= v1.6.1
 
 # Bundle Version is the semantic version(required by operator-sdk)
-BUNDLE_VERSION ?= 1.6.0
+BUNDLE_VERSION ?= 1.6.1
 
 # Timestamp local builds
 TIMESTAMP := $(shell  date +%Y%m%d%H%M%S)
@@ -37,5 +37,5 @@ IMG ?= "$(REGISTRY)/$(IMAGE_TAG_BASE):$(VERSION)"
 # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
 BUNDLE_IMG ?= "$(REGISTRY)/$(BUNDLE_IMAGE_TAG_BASE_COMMUNITY):$(VERSION)"
 
-# The image tag given to the resulting catalog image (e.g. make catalog-build CATALOG_IMG=example.com/operator-catalog:v1.6.0).
+# The image tag given to the resulting catalog image (e.g. make catalog-build CATALOG_IMG=example.com/operator-catalog:v1.6.1).
 CATALOG_IMG ?= "$(REGISTRY)/$(CATALOG_IMAGE_TAG_BASE_COMMUNITY):$(VERSION)"