Merge branch 'main' of https://github.com/dell/csm-operator into usr/…

…Harshita_Pandey/krv27874

operatorconfig/moduleconfig/resiliency/v1.11.0/container-powerflex-controller.yaml

@@ -16,6 +16,17 @@
 name: podmon
 image: dellemc/podmon:v1.11.0
 imagePullPolicy: IfNotPresent
+args:
+  - "--labelvalue=csi-vxflexos"
+  - "--skipArrayConnectionValidation=false"
+  - "--driverPodLabelValue=dell-storage"
+  - "--ignoreVolumelessPods=false"
+  - "--arrayConnectivityPollRate=5"
+  - "--arrayConnectivityConnectionLossThreshold=3"
+  # Below 3 args should not be modified.
+  - "--csisock=unix:/var/run/csi/csi.sock"
+  - "--mode=controller"
+  - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml"
 env:
   - name: MY_NODE_NAME
     valueFrom:

operatorconfig/moduleconfig/resiliency/v1.11.0/container-powerflex-node.yaml

@@ -21,7 +21,19 @@ securityContext:
   capabilities:
     add: ["SYS_ADMIN"]
   allowPrivilegeEscalation: true
+args:
+  - "--labelvalue=csi-vxflexos"
+  - "--leaderelection=false"
+  - "--driverPodLabelValue=dell-storage"
+  - "--ignoreVolumelessPods=false"
+  - "--arrayConnectivityPollRate=5"
+  # Below 3 args should not be modified.
+  - "--csisock=unix:/var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock"
+  - "--mode=node"
+  - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml"
 env:
+  - name: "X_CSI_PODMON_API_PORT"
+    value: "8083"
   - name: KUBE_NODE_NAME
     valueFrom:
       fieldRef:

samples/minimal-samples/powerflex.yaml

@@ -7,3 +7,11 @@ spec:
   driver:
     csiDriverType: "powerflex"
     configVersion: v2.11.0
+  modules:
+    - name: resiliency
+      # enabled: Enable/Disable Resiliency feature
+      # Allowed values:
+      #   true: enable Resiliency feature(deploy podmon sidecar)
+      #   false: disable Resiliency feature(do not deploy podmon sidecar)
+      # Default value: false
+      enabled: false