From 02d95ad7d21618ca80f4ca0707d1089c20b32cb6 Mon Sep 17 00:00:00 2001 From: Garg Date: Wed, 17 May 2023 12:40:00 +0530 Subject: [PATCH 1/4] Resiliency_module_node_and_sample_yaml_powerflex --- .../powerflex/v2.7.0/controller.yaml | 12 +++++++ samples/storage_csm_powerflex_v270.yaml | 35 ++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/operatorconfig/driverconfig/powerflex/v2.7.0/controller.yaml b/operatorconfig/driverconfig/powerflex/v2.7.0/controller.yaml index 6039475df..3f8cddc24 100644 --- a/operatorconfig/driverconfig/powerflex/v2.7.0/controller.yaml +++ b/operatorconfig/driverconfig/powerflex/v2.7.0/controller.yaml @@ -52,6 +52,9 @@ rules: - apiGroups: [""] resources: ["secrets"] verbs: ["get", "list"] + - apiGroups: ["volumegroup.storage.dell.com"] + resources: ["dellcsivolumegroupsnapshots","dellcsivolumegroupsnapshots/status"] + verbs: ["create", "list", "watch", "delete", "update"] - apiGroups: ["snapshot.storage.k8s.io"] resources: ["volumesnapshotclasses"] verbs: ["get", "list", "watch"] @@ -147,6 +150,15 @@ spec: volumeMounts: - name: socket-dir mountPath: /var/run/csi + - name: vg-snapshotter + image: dellemc/csi-volumegroup-snapshotter:v1.2.0 + imagePullPolicy: IfNotPresent + env: + - name: ADDRESS + value: /var/run/csi/csi.sock + volumeMounts: + - name: socket-dir + mountPath: /var/run/csi - name: csi-external-health-monitor-controller image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.8.0 imagePullPolicy: IfNotPresent diff --git a/samples/storage_csm_powerflex_v270.yaml b/samples/storage_csm_powerflex_v270.yaml index 65ca42286..aa57dd7b4 100644 --- a/samples/storage_csm_powerflex_v270.yaml +++ b/samples/storage_csm_powerflex_v270.yaml @@ -249,7 +249,6 @@ spec: # Default value: "otel-collector:55680" - name: "COLLECTOR_ADDRESS" value: "otel-collector:55680" - # Replication: allows to configure replication # Replication CRDs must be installed before installing driver - name: replication @@ -311,3 +310,37 @@ spec: # image: Defines replication init container image. This shouldn't be changed # Allowed values: string image: dellemc/dell-replication-init:v1.0.0 + + - 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 + configVersion: v1.6.0 + components: + - name: podmon-controller + args: + - "--csisock=unix:/var/run/csi/csi.sock" + - "--labelvalue=csi-vxflexos" + - "--mode=controller" + - "--skipArrayConnectionValidation=false" + - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" + - "--driverPodLabelValue=dell-storage" + - "--ignoreVolumelessPods=false" + - name: podmon-node + envs: + # podmonAPIPort: Defines the port to be used within the kubernetes cluster + # Allowed values: Any valid and free port (string) + # Default value: 8083 + - name: "X_CSI_PODMON_API_PORT" + value: "8083" + args: + - "--csisock=unix:/var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock" + - "--labelvalue=csi-vxflexos" + - "--mode=node" + - "--leaderelection=false" + - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" + - "--driverPodLabelValue=dell-storage" + - "--ignoreVolumelessPods=false" From 9dd834e1e2f3a47cf1e25e262b2047e05cf166df Mon Sep 17 00:00:00 2001 From: Garg Date: Wed, 17 May 2023 14:06:49 +0530 Subject: [PATCH 2/4] Resiliency_module_node_and_sample_yaml_powerflex --- .../driverconfig/powerflex/v2.7.0/controller.yaml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/operatorconfig/driverconfig/powerflex/v2.7.0/controller.yaml b/operatorconfig/driverconfig/powerflex/v2.7.0/controller.yaml index 3f8cddc24..6039475df 100644 --- a/operatorconfig/driverconfig/powerflex/v2.7.0/controller.yaml +++ b/operatorconfig/driverconfig/powerflex/v2.7.0/controller.yaml @@ -52,9 +52,6 @@ rules: - apiGroups: [""] resources: ["secrets"] verbs: ["get", "list"] - - apiGroups: ["volumegroup.storage.dell.com"] - resources: ["dellcsivolumegroupsnapshots","dellcsivolumegroupsnapshots/status"] - verbs: ["create", "list", "watch", "delete", "update"] - apiGroups: ["snapshot.storage.k8s.io"] resources: ["volumesnapshotclasses"] verbs: ["get", "list", "watch"] @@ -150,15 +147,6 @@ spec: volumeMounts: - name: socket-dir mountPath: /var/run/csi - - name: vg-snapshotter - image: dellemc/csi-volumegroup-snapshotter:v1.2.0 - imagePullPolicy: IfNotPresent - env: - - name: ADDRESS - value: /var/run/csi/csi.sock - volumeMounts: - - name: socket-dir - mountPath: /var/run/csi - name: csi-external-health-monitor-controller image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.8.0 imagePullPolicy: IfNotPresent From 4e7622437f70247350d883ab3b028c6fbd30a34f Mon Sep 17 00:00:00 2001 From: Garg Date: Thu, 18 May 2023 11:40:51 +0530 Subject: [PATCH 3/4] Resiliency_module_node_and_sample_yaml_powerflex --- samples/storage_csm_powerflex_v270.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/samples/storage_csm_powerflex_v270.yaml b/samples/storage_csm_powerflex_v270.yaml index aa57dd7b4..34d10c3d3 100644 --- a/samples/storage_csm_powerflex_v270.yaml +++ b/samples/storage_csm_powerflex_v270.yaml @@ -249,6 +249,7 @@ spec: # Default value: "otel-collector:55680" - name: "COLLECTOR_ADDRESS" value: "otel-collector:55680" + # Replication: allows to configure replication # Replication CRDs must be installed before installing driver - name: replication From d5fea9d8f8814ebe985c201835ab4fb8e7d7688e Mon Sep 17 00:00:00 2001 From: Garg Date: Thu, 18 May 2023 12:39:27 +0530 Subject: [PATCH 4/4] Resiliency_module_node_and_sample_yaml_powerflex --- samples/storage_csm_powerflex_v270.yaml | 48 ++++++++++++------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/samples/storage_csm_powerflex_v270.yaml b/samples/storage_csm_powerflex_v270.yaml index 34d10c3d3..124e87c61 100644 --- a/samples/storage_csm_powerflex_v270.yaml +++ b/samples/storage_csm_powerflex_v270.yaml @@ -321,27 +321,27 @@ spec: enabled: false configVersion: v1.6.0 components: - - name: podmon-controller - args: - - "--csisock=unix:/var/run/csi/csi.sock" - - "--labelvalue=csi-vxflexos" - - "--mode=controller" - - "--skipArrayConnectionValidation=false" - - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" - - "--driverPodLabelValue=dell-storage" - - "--ignoreVolumelessPods=false" - - name: podmon-node - envs: - # podmonAPIPort: Defines the port to be used within the kubernetes cluster - # Allowed values: Any valid and free port (string) - # Default value: 8083 - - name: "X_CSI_PODMON_API_PORT" - value: "8083" - args: - - "--csisock=unix:/var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock" - - "--labelvalue=csi-vxflexos" - - "--mode=node" - - "--leaderelection=false" - - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" - - "--driverPodLabelValue=dell-storage" - - "--ignoreVolumelessPods=false" + - name: podmon-controller + args: + - "--csisock=unix:/var/run/csi/csi.sock" + - "--labelvalue=csi-vxflexos" + - "--mode=controller" + - "--skipArrayConnectionValidation=false" + - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" + - "--driverPodLabelValue=dell-storage" + - "--ignoreVolumelessPods=false" + - name: podmon-node + envs: + # podmonAPIPort: Defines the port to be used within the kubernetes cluster + # Allowed values: Any valid and free port (string) + # Default value: 8083 + - name: "X_CSI_PODMON_API_PORT" + value: "8083" + args: + - "--csisock=unix:/var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock" + - "--labelvalue=csi-vxflexos" + - "--mode=node" + - "--leaderelection=false" + - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" + - "--driverPodLabelValue=dell-storage" + - "--ignoreVolumelessPods=false"