Update csi-powerstore helm charts to v2.9.1

New update to csi-powerstore helm-chart to v2.9.1 based on
https://github.com/dell/helm-charts/releases/tag/csi-powerstore-2.9.1

New file structure and addition of new auto-version support
for all helm-charts.

Test Plan:
  PASS: All packages built
  PASS: Upload/apply/remove/delete/update dell-storage app in
  AIO-SX HW lab.
  PASS: Create pvc and read/write using csi-powerstore.

Story: 2010693
Task: 49639

Change-Id: I5d7eb562ed11ab98d2452c63a12409818db043fb
Signed-off-by: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>

csi-powerstore-helm/debian/deb_folder/patches/0001-csi-powerstore-add-default-values-for-templates.patch

@@ -1,128 +0,0 @@
-From 440bc4958f417f2d4d76fcd3a7d667dcdd420ef0 Mon Sep 17 00:00:00 2001
-From: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
-Date: Wed, 13 Sep 2023 12:53:05 -0300
-Subject: [PATCH] csi-powerstore: add default values for templates
-
-This patch consists of adding the default values in the values.yaml of
-the helm chart.
-It's necessary because the images in templates were in unexpected format
-for the system and because templates need default values to be able
-to build the package.
-
-Signed-off-by: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
----
- helm/csi-powerstore/values.yaml | 53 +++++++++++++++++++++++++++++----
- 1 file changed, 48 insertions(+), 5 deletions(-)
-
-diff --git a/helm/csi-powerstore/values.yaml b/helm/csi-powerstore/values.yaml
-index 0d4686b..25b0404 100644
---- a/helm/csi-powerstore/values.yaml
-+++ b/helm/csi-powerstore/values.yaml
-@@ -22,6 +22,12 @@
- # Default value: None
- driverName: "csi-powerstore.dellemc.com"
- 
-+driver:
-+  # image: Image to use for driver sidecar. This shouldn't be changed
-+  # Allowed values: string
-+  # Default value: dellemc/csi-powerstore:v2.7.0
-+  image: docker.io/dellemc/csi-powerstore:v2.7.0
-+
- # Driver version required to pull the latest driver image
- version: "v2.7.0"
- 
-@@ -76,6 +82,17 @@ podmonAPIPort: 8083
- 
- # controller: configure controller specific parameters
- controller:
-+  attacher:
-+    # image: Image to use for attacher sidecar. This shouldn't be changed
-+    # Allowed values: string
-+    # Default value: registry.k8s.io/sig-storage/csi-attacher:v4.3.0
-+    image: registry.k8s.io/sig-storage/csi-attacher:v4.3.0
-+  provisioner:
-+    # image: Image to use for provisioner sidecar. This shouldn't be changed
-+    # Allowed values: string
-+    # Default value: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
-+    image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
-+
-   # controllerCount: defines the number of csi-powerstore controller pods to deploy to
-   # the Kubernetes release.
-   # Allowed values: n, where n > 0
-@@ -111,6 +128,11 @@ controller:
-     # Default value: None
-     enabled: true
- 
-+    # image: Image to use for snapshotter sidecar. This shouldn't be changed
-+    # Allowed values: string
-+    # Default value: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2
-+    image: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2
-+
-     # snapNamePrefix: Prefix to apply to the names of a created snapshots
-     # Allowed values: string
-     # Default value: None
-@@ -124,6 +146,11 @@ controller:
-     # Default value: true
-     enabled: true
- 
-+    # image: Image to use for resizer sidecar. This shouldn't be changed
-+    # Allowed values: string
-+    # Default value: registry.k8s.io/sig-storage/csi-resizer:v1.8.0
-+    image: registry.k8s.io/sig-storage/csi-resizer:v1.8.0
-+
-   healthMonitor:
-     # enabled: Enable/Disable health monitor of CSI volumes
-     # Allowed values:
-@@ -132,6 +159,11 @@ controller:
-     # Default value: false
-     enabled: false
- 
-+    # image: Image to use for csi-external-health-monitor-controller sidecar. This shouldn't be changed
-+    # Allowed values: string
-+    # Default value: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0
-+    image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0
-+
-     # interval: Interval of monitoring volume health condition
-     # Allowed values: Number followed by unit (s,m,h)
-     # Examples: 60s, 5m, 1h
-@@ -163,8 +195,11 @@ controller:
-     # Default value: replication.storage.dell.com
-     replicationPrefix: "replication.storage.dell.com"
- 
--  # Image for csi-metadata-retriever
--  metadataretriever: dellemc/csi-metadata-retriever:v1.4.0
-+  metadataretriever:
-+    # image: Image to use for csi-metadata-retriever sidecar. This shouldn't be changed
-+    # Allowed values: string
-+    # Default value: dellemc/csi-metadata-retriever:v1.4.0
-+    image: docker.io/dellemc/csi-metadata-retriever:v1.4.0
- 
-   # nodeSelector: Define node selection constraints for controller pods.
-   # For the pod to be eligible to run on a node, the node must have each
-@@ -194,6 +229,12 @@ controller:
- 
- # node: configure node pod specific parameters
- node:
-+  registrar:
-+    # image: Image to use for registrar sidecar. This shouldn't be changed
-+    # Allowed values: string
-+    # Default value: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
-+    image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
-+
-   # nodeNamePrefix: defines a string prepended to each node registered by the CSI driver.
-   # Allowed values: string
-   # Default value: None
-@@ -336,6 +377,8 @@ podmon:
-   #    - "--driverPodLabelValue=dell-storage"
-   #    - "--ignoreVolumelessPods=false"
- 
--images:
--  # "driver" defines the container image, used for the driver container.
--  driverRepository: dellemc
-+storageClasses:
-+
-+secret:
-+  create: true
-+  arrays:
--- 
-2.25.1

csi-powerstore-helm/debian/deb_folder/patches/0004-csi-powerstore-fix-image-path-for-templates.patch

@@ -1,106 +0,0 @@
-From 4e9698e29c69382c333e4df22f2ec043da0c4a82 Mon Sep 17 00:00:00 2001
-From: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
-Date: Thu, 27 Apr 2023 10:51:06 -0300
-Subject: [PATCH] csi-powerstore: fix image path for templates
-
-This patch consists of changing the format to use the image path directly
-following the expected format used by kube_app.
-
-Signed-off-by: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
-Signed-off-by: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
----
- helm/csi-powerstore/templates/controller.yaml | 14 +++++++-------
- helm/csi-powerstore/templates/node.yaml       |  4 ++--
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/helm/csi-powerstore/templates/controller.yaml b/helm/csi-powerstore/templates/controller.yaml
-index 3067302..097084b 100644
---- a/helm/csi-powerstore/templates/controller.yaml
-+++ b/helm/csi-powerstore/templates/controller.yaml
-@@ -223,7 +223,7 @@ spec:
-         {{ if .Values.dev.enableTracing }}{{- include "pstore.tracing" . | nindent 8 }}{{ end }}
-         {{- end }}
-         - name: attacher
--          image: {{ required "Must provide the CSI attacher container image." ( include "csi-powerstore.attacherImage" . ) }}
-+          image: {{ .Values.controller.attacher.image }}
-           imagePullPolicy: {{ .Values.imagePullPolicy }}
-           args:
-             - "--csi-address=$(ADDRESS)"
-@@ -241,7 +241,7 @@ spec:
-         {{- if hasKey .Values.controller "resizer" }}
-         {{- if eq .Values.controller.resizer.enabled true }}
-         - name: resizer
--          image: {{ required "Must provide the CSI resizer container image."  ( include "csi-powerstore.resizerImage" . ) }}
-+          image: {{ .Values.controller.resizer.image }}
-           imagePullPolicy: {{ .Values.imagePullPolicy }}
-           args:
-             - "--csi-address=$(ADDRESS)"
-@@ -256,7 +256,7 @@ spec:
-         {{end}}
-         {{end}}
-         - name: provisioner
--          image: {{ required "Must provide the CSI provisioner container image." ( include "csi-powerstore.provisionerImage" . ) }}
-+          image: {{ .Values.controller.provisioner.image }}
-           imagePullPolicy: {{ .Values.imagePullPolicy }}
-           args:
-             - "--csi-address=$(ADDRESS)"
-@@ -287,7 +287,7 @@ spec:
-         {{- if hasKey .Values.controller "snapshot" }}
-         {{- if eq .Values.controller.snapshot.enabled true }}
-         - name: snapshotter
--          image: {{ required "Must provide the CSI snapshotter container image." ( include "csi-powerstore.snapshotterImage" . ) }}
-+          image: {{ .Values.controller.snapshot.image }}
-           imagePullPolicy: {{ .Values.imagePullPolicy }}
-           args:
-             - "--csi-address=$(ADDRESS)"
-@@ -346,7 +346,7 @@ spec:
-         {{- if hasKey .Values.controller "healthMonitor" }}
-         {{- if eq .Values.controller.healthMonitor.enabled true}}
-         - name: csi-external-health-monitor-controller
--          image: {{ required "Must provide the CSI external health monitor controller image." ( include "csi-powerstore.healthmonitorImage" . ) }}
-+          image: {{ .Values.controller.healthMonitor.image }}
-           imagePullPolicy: {{ .Values.imagePullPolicy }}
-           args:
-             - "--v=5"
-@@ -365,7 +365,7 @@ spec:
-         {{- end }}
-         {{- end }}
-         - name: csi-metadata-retriever
--          image: {{ required "Must provide the CSI Metadata retriever container image." .Values.controller.metadataretriever }}
-+          image: {{ .Values.controller.metadataretriever.image }}
-           imagePullPolicy: {{ .Values.imagePullPolicy }}
-           command: [ "/csi-metadata-retriever" ]
-           env:
-@@ -380,7 +380,7 @@ spec:
-             - name: socket-dir
-               mountPath: /var/run/csi
-         - name: driver
--          image: {{ required "Must provide the PowerStore driver image repository." .Values.images.driverRepository }}/{{ .Chart.Name }}:{{ .Values.version }}
-+          image: {{ .Values.driver.image }}
-           imagePullPolicy: {{ .Values.imagePullPolicy }}
-           command: [ "/csi-powerstore" ]
-           env:
-diff --git a/helm/csi-powerstore/templates/node.yaml b/helm/csi-powerstore/templates/node.yaml
-index f09982d..643293f 100644
---- a/helm/csi-powerstore/templates/node.yaml
-+++ b/helm/csi-powerstore/templates/node.yaml
-@@ -171,7 +171,7 @@ spec:
-             capabilities:
-               add: ["SYS_ADMIN"]
-             allowPrivilegeEscalation: true
--          image: {{ required "Must provide the Powerstore driver image repository." .Values.images.driverRepository }}/{{ .Chart.Name }}:{{ .Values.version }}
-+          image: {{ .Values.driver.image }}
-           imagePullPolicy: {{ .Values.imagePullPolicy }}
-           command: [ "/csi-powerstore" ]
-           env:
-@@ -264,7 +264,7 @@ spec:
-             - name: powerstore-config-params
-               mountPath: /powerstore-config-params
-         - name: registrar
--          image: {{ required "Must provide the CSI node registrar container image." ( include "csi-powerstore.registrarImage" . ) }}
-+          image: {{ .Values.node.registrar.image }}
-           imagePullPolicy: {{ .Values.imagePullPolicy }}
-           args:
-             - "--v=5"
--- 
-2.25.1

csi-powerstore-helm/debian/deb_folder/patches/0006-csi-powerstore-add-separator-after-comments.patch

@@ -1,94 +0,0 @@
-From f1ce3215bd0f80031fed455508e5adfe57e270d0 Mon Sep 17 00:00:00 2001
-From: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
-Date: Wed, 13 Sep 2023 16:27:25 -0300
-Subject: [PATCH] csi-powerstore: add separator after comments
-
-This patch consists of adding separator between header comments and
-the resources.
-It's necessary because the helm couldn't render the chart and it
-had been fixed by adding this separator that indicates when
-the resource starts.
-
-Signed-off-by: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
----
- helm/csi-powerstore/Chart.yaml                          | 2 ++
- helm/csi-powerstore/templates/controller.yaml           | 2 ++
- helm/csi-powerstore/templates/csidriver.yaml            | 2 ++
- helm/csi-powerstore/templates/driver-config-params.yaml | 4 +++-
- helm/csi-powerstore/templates/node.yaml                 | 2 ++
- 5 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/helm/csi-powerstore/Chart.yaml b/helm/csi-powerstore/Chart.yaml
-index 5f4bf35..a36c8f4 100644
---- a/helm/csi-powerstore/Chart.yaml
-+++ b/helm/csi-powerstore/Chart.yaml
-@@ -14,6 +14,8 @@
- #
- #
- 
-+---
-+
- name: csi-powerstore
- apiVersion: v2
- version: 2.7.0
-diff --git a/helm/csi-powerstore/templates/controller.yaml b/helm/csi-powerstore/templates/controller.yaml
-index d2ce1fa..cd1ce8d 100644
---- a/helm/csi-powerstore/templates/controller.yaml
-+++ b/helm/csi-powerstore/templates/controller.yaml
-@@ -14,6 +14,8 @@
- #
- #
- 
-+---
-+
- apiVersion: v1
- kind: ServiceAccount
- metadata:
-diff --git a/helm/csi-powerstore/templates/csidriver.yaml b/helm/csi-powerstore/templates/csidriver.yaml
-index 2cca097..4724c4f 100644
---- a/helm/csi-powerstore/templates/csidriver.yaml
-+++ b/helm/csi-powerstore/templates/csidriver.yaml
-@@ -14,6 +14,8 @@
- #
- #
- 
-+---
-+
- apiVersion: storage.k8s.io/v1
- kind: CSIDriver
- metadata:
-diff --git a/helm/csi-powerstore/templates/driver-config-params.yaml b/helm/csi-powerstore/templates/driver-config-params.yaml
-index 0c8f07c..0efc954 100644
---- a/helm/csi-powerstore/templates/driver-config-params.yaml
-+++ b/helm/csi-powerstore/templates/driver-config-params.yaml
-@@ -14,6 +14,8 @@
- #
- #
- 
-+---
-+
- apiVersion: v1
- kind: ConfigMap
- metadata:
-@@ -28,4 +30,4 @@ data:
-     PODMON_CONTROLLER_LOG_FORMAT: "{{ .Values.logFormat }}"
-     PODMON_NODE_LOG_LEVEL: "{{ .Values.logLevel }}"
-     PODMON_NODE_LOG_FORMAT: "{{ .Values.logFormat }}"
--    {{ end }}
-\ No newline at end of file
-+    {{ end }}
-diff --git a/helm/csi-powerstore/templates/node.yaml b/helm/csi-powerstore/templates/node.yaml
-index 6263152..51d5b8f 100644
---- a/helm/csi-powerstore/templates/node.yaml
-+++ b/helm/csi-powerstore/templates/node.yaml
-@@ -14,6 +14,8 @@
- #
- #
- 
-+---
-+
- apiVersion: v1
- kind: ServiceAccount
- metadata:
--- 
-2.25.1

csi-powerstore-helm/debian/deb_folder/patches/0007-csi-powerstore-enabling-csm-resiliency.patch

@@ -1,203 +0,0 @@
-From 3e281f2609bcde8bc807aa94842739ebfbf49bed Mon Sep 17 00:00:00 2001
-From: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
-Date: Wed, 13 Sep 2023 16:53:35 -0300
-Subject: [PATCH] csi-powerstore: enabling csm-resiliency
-
-This patch consists of changing the format of the values in templates and
-changing the values.yaml for the user be able to enable csm-resiliency.
-
-Signed-off-by: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
----
- helm/csi-powerstore/templates/controller.yaml | 12 ++---
- .../templates/driver-config-params.yaml       |  2 +-
- helm/csi-powerstore/templates/node.yaml       | 12 ++---
- helm/csi-powerstore/values.yaml               | 51 ++++++++++---------
- 4 files changed, 40 insertions(+), 37 deletions(-)
-
-diff --git a/helm/csi-powerstore/templates/controller.yaml b/helm/csi-powerstore/templates/controller.yaml
-index cd1ce8d..0d04bf4 100644
---- a/helm/csi-powerstore/templates/controller.yaml
-+++ b/helm/csi-powerstore/templates/controller.yaml
-@@ -40,7 +40,7 @@ rules:
-   - apiGroups: [""]
-     resources: ["nodes"]
-   {{- if hasKey .Values "podmon" }}
--  {{- if eq .Values.podmon.enabled true }}
-+  {{- if .Values.csm.resiliency }}
-     verbs: ["get", "list", "watch", "patch"]
-   {{- else }}
-     verbs: ["get", "list", "watch"]
-@@ -58,7 +58,7 @@ rules:
-   - apiGroups: ["storage.k8s.io"]
-     resources: ["volumeattachments"]
-   {{- if hasKey .Values "podmon" }}
--  {{- if eq .Values.podmon.enabled true }}
-+  {{- if .Values.csm.resiliency }}
-     verbs: ["get", "list", "watch", "update", "patch", "delete"]
-   {{- else }}
-     verbs: ["get", "list", "watch", "update", "patch"]
-@@ -98,7 +98,7 @@ rules:
-   - apiGroups: [""]
-     resources: ["pods"]
-   {{- if hasKey .Values "podmon" }}
--  {{- if eq .Values.podmon.enabled true }}
-+  {{- if .Values.csm.resiliency }}
-     verbs: ["get", "list", "watch", "update", "delete"]
-   {{- else }}
-     verbs: ["get", "list", "watch"]
-@@ -197,7 +197,7 @@ spec:
-               topologyKey: "kubernetes.io/hostname"
-       containers:
-         {{- if hasKey .Values "podmon" }}
--        {{- if eq .Values.podmon.enabled true }}
-+        {{- if .Values.csm.resiliency }}
-         - name: podmon
-           image: {{ required "Must provide the podmon container image." .Values.podmon.image }}
-           imagePullPolicy: {{ .Values.imagePullPolicy }}
-@@ -411,8 +411,8 @@ spec:
-               value: /powerstore-config-params/driver-config-params.yaml
-             {{- if hasKey .Values "podmon" }}
-             - name: X_CSI_PODMON_ENABLED
--              value: "{{ .Values.podmon.enabled }}"
--            {{- if eq .Values.podmon.enabled true }}
-+              value: "{{ .Values.csm.resiliency }}"
-+            {{- if .Values.csm.resiliency }}
-               {{- range $key, $value := .Values.podmon.controller.args }}
-                 {{- if contains "--arrayConnectivityPollRate" $value }}
-             - name: X_CSI_PODMON_ARRAY_CONNECTIVITY_POLL_RATE
-diff --git a/helm/csi-powerstore/templates/driver-config-params.yaml b/helm/csi-powerstore/templates/driver-config-params.yaml
-index 0efc954..6ea59e9 100644
---- a/helm/csi-powerstore/templates/driver-config-params.yaml
-+++ b/helm/csi-powerstore/templates/driver-config-params.yaml
-@@ -25,7 +25,7 @@ data:
-   driver-config-params.yaml: |
-     CSI_LOG_LEVEL: "{{ .Values.logLevel }}"
-     CSI_LOG_FORMAT: "{{ .Values.logFormat }}"
--    {{ if .Values.podmon.enabled }}
-+    {{ if .Values.csm.resiliency }}
-     PODMON_CONTROLLER_LOG_LEVEL: "{{ .Values.logLevel }}"
-     PODMON_CONTROLLER_LOG_FORMAT: "{{ .Values.logFormat }}"
-     PODMON_NODE_LOG_LEVEL: "{{ .Values.logLevel }}"
-diff --git a/helm/csi-powerstore/templates/node.yaml b/helm/csi-powerstore/templates/node.yaml
-index 51d5b8f..93ae034 100644
---- a/helm/csi-powerstore/templates/node.yaml
-+++ b/helm/csi-powerstore/templates/node.yaml
-@@ -57,7 +57,7 @@ rules:
-     resources: ["securitycontextconstraints"]
-     verbs: ["use"]
-   {{- if hasKey .Values "podmon" }}
--  {{- if eq .Values.podmon.enabled true }}
-+  {{- if .Values.csm.resiliency }}
-   - apiGroups: [""]
-     resources: ["pods"]
-     verbs: ["get", "list", "watch", "update", "delete"]
-@@ -97,7 +97,7 @@ spec:
-     metadata:
-       labels:
-         app: {{ .Release.Name }}-node
--      {{- if .Values.podmon.enabled }}
-+      {{- if .Values.csm.resiliency }}
-         driver.dellemc.com: dell-storage
-       {{- end }}
-     spec:
-@@ -115,7 +115,7 @@ spec:
-       hostIPC: true
-       containers:
-       {{- if hasKey .Values "podmon" }}
--      {{- if eq .Values.podmon.enabled true }}
-+      {{- if .Values.csm.resiliency }}
-         - name: podmon
-           securityContext:
-             privileged: true
-@@ -228,8 +228,8 @@ spec:
-             {{- end }}
-             {{- if hasKey .Values "podmon" }}
-             - name: X_CSI_PODMON_ENABLED
--              value: "{{ .Values.podmon.enabled }}"
--            {{- if eq .Values.podmon.enabled true }}
-+              value: "{{ .Values.csm.resiliency }}"
-+            {{- if .Values.csm.resiliency }}
-               {{- range $key, $value := .Values.podmon.node.args }}
-                 {{- if contains "--arrayConnectivityPollRate" $value }}
-             - name: X_CSI_PODMON_ARRAY_CONNECTIVITY_POLL_RATE
-@@ -338,7 +338,7 @@ spec:
-           secret:
-             secretName: {{ .Release.Name }}-config
-         {{- if hasKey .Values "podmon" }}
--        {{- if eq .Values.podmon.enabled true }}
-+        {{- if .Values.csm.resiliency }}
-         - name: usr-bin
-           hostPath:
-             path: /usr/bin
-diff --git a/helm/csi-powerstore/values.yaml b/helm/csi-powerstore/values.yaml
-index 25b0404..15f95cf 100644
---- a/helm/csi-powerstore/values.yaml
-+++ b/helm/csi-powerstore/values.yaml
-@@ -14,6 +14,10 @@
- #
- #
- 
-+# CSM Control
-+csm:
-+  resiliency: false
-+
- ## K8S/DRIVER ATTRIBUTES
- ########################
- 
-@@ -351,31 +355,30 @@ storageCapacity:
- 
- # Enable this feature only after contact support for additional information
- podmon:
--  enabled: false
-   image: dellemc/podmon:v1.6.0
--  #controller:
--  #  args:
--  #    - "--csisock=unix:/var/run/csi/csi.sock"
--  #    - "--labelvalue=csi-powerstore"
--  #    - "--arrayConnectivityPollRate=60"
--  #    - "--driverPath=csi-powerstore.dellemc.com"
--  #    - "--mode=controller"
--  #    - "--skipArrayConnectionValidation=false"
--  #    - "--driver-config-params=/powerstore-config-params/driver-config-params.yaml"
--  #    - "--driverPodLabelValue=dell-storage"
--  #    - "--ignoreVolumelessPods=false"
--
--  #node:
--  #  args:
--  #    - "--csisock=unix:/var/lib/kubelet/plugins/csi-powerstore.dellemc.com/csi_sock"
--  #    - "--labelvalue=csi-powerstore"
--  #    - "--arrayConnectivityPollRate=60"
--  #    - "--driverPath=csi-powerstore.dellemc.com"
--  #    - "--mode=node"
--  #    - "--leaderelection=false"
--  #    - "--driver-config-params=/powerstore-config-params/driver-config-params.yaml"
--  #    - "--driverPodLabelValue=dell-storage"
--  #    - "--ignoreVolumelessPods=false"
-+  controller:
-+    args:
-+      - "--csisock=unix:/var/run/csi/csi.sock"
-+      - "--labelvalue=csi-powerstore"
-+      - "--arrayConnectivityPollRate=60"
-+      - "--driverPath=csi-powerstore.dellemc.com"
-+      - "--mode=controller"
-+      - "--skipArrayConnectionValidation=false"
-+      - "--driver-config-params=/powerstore-config-params/driver-config-params.yaml"
-+      - "--driverPodLabelValue=dell-storage"
-+      - "--ignoreVolumelessPods=false"
-+
-+  node:
-+    args:
-+      - "--csisock=unix:/var/lib/kubelet/plugins/csi-powerstore.dellemc.com/csi_sock"
-+      - "--labelvalue=csi-powerstore"
-+      - "--arrayConnectivityPollRate=60"
-+      - "--driverPath=csi-powerstore.dellemc.com"
-+      - "--mode=node"
-+      - "--leaderelection=false"
-+      - "--driver-config-params=/powerstore-config-params/driver-config-params.yaml"
-+      - "--driverPodLabelValue=dell-storage"
-+      - "--ignoreVolumelessPods=false"
- 
- storageClasses:
- 
--- 
-2.25.1

csi-powerstore-helm/debian/deb_folder/patches/0008-csi-powerstore-enabling-csm-replication.patch

@@ -1,73 +0,0 @@
-From 670df9336ad3f309e9a55b353c794379a1af3400 Mon Sep 17 00:00:00 2001
-From: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
-Date: Wed, 13 Sep 2023 16:57:54 -0300
-Subject: [PATCH] csi-powerstore: enabling csm-replication
-
-This patch consists of changing the format of the values in templates and
-changing the values.yaml for the user be able to enable csm-replication.
-
-Signed-off-by: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
----
- helm/csi-powerstore/templates/controller.yaml | 6 +++---
- helm/csi-powerstore/values.yaml               | 8 +-------
- 2 files changed, 4 insertions(+), 10 deletions(-)
-
-diff --git a/helm/csi-powerstore/templates/controller.yaml b/helm/csi-powerstore/templates/controller.yaml
-index 0d04bf4..dee48e8 100644
---- a/helm/csi-powerstore/templates/controller.yaml
-+++ b/helm/csi-powerstore/templates/controller.yaml
-@@ -116,7 +116,7 @@ rules:
-     verbs: ["update", "patch"]
-   # below for dell-csi-replicator
-   {{- if hasKey .Values.controller "replication" }}
--  {{- if eq .Values.controller.replication.enabled true}}
-+  {{- if .Values.csm.replication }}
-   - apiGroups: ["replication.storage.dell.com"]
-     resources: ["dellcsireplicationgroups"]
-     verbs: ["create", "delete", "get", "list", "patch", "update", "watch"]
-@@ -320,7 +320,7 @@ spec:
-         {{- end }}
-         {{- end }}
-         {{- if hasKey .Values.controller "replication" }}
--        {{- if eq .Values.controller.replication.enabled true}}
-+        {{- if .Values.csm.replication }}
-         - name: dell-csi-replicator
-           image: {{ required "Must provide the Dell CSI Replicator image." .Values.controller.replication.image}}
-           imagePullPolicy: {{ .Values.imagePullPolicy }}
-@@ -424,7 +424,7 @@ spec:
-             - name: X_CSI_PODMON_API_PORT
-               value: "{{ .Values.podmonAPIPort }}"
-             {{- if hasKey .Values.controller "replication" }}
--            {{- if eq .Values.controller.replication.enabled true}}
-+            {{- if .Values.csm.replication }}
-             - name: X_CSI_REPLICATION_CONTEXT_PREFIX
-               value: {{ .Values.controller.replication.replicationContextPrefix | default "powerstore"}}
-             - name: X_CSI_REPLICATION_PREFIX
-diff --git a/helm/csi-powerstore/values.yaml b/helm/csi-powerstore/values.yaml
-index 3e77a43..198e59c 100644
---- a/helm/csi-powerstore/values.yaml
-+++ b/helm/csi-powerstore/values.yaml
-@@ -16,6 +16,7 @@
- 
- # CSM Control
- csm:
-+  replication: false
-   resiliency: false
- 
- ## K8S/DRIVER ATTRIBUTES
-@@ -177,13 +178,6 @@ controller:
-   # replication: allows to configure replication
-   # Replication CRDs must be installed before installing driver
-   replication:
--    # enabled: Enable/Disable replication feature
--    # Allowed values:
--    #   true: enable replication feature(install dell-csi-replicator sidecar)
--    #   false: disable replication feature(do not install dell-csi-replicator sidecar)
--    # Default value: false
--    enabled: false
--
-     # image: Image to use for dell-csi-replicator. This shouldn't be changed
-     # Allowed values: string
-     # Default value: None
--- 
-2.25.1

csi-powerstore-helm/debian/deb_folder/rules

@@ -1,20 +0,0 @@
-#!/usr/bin/make -f
-export DH_VERBOSE = 1
-
-export ROOT = debian/tmp
-export APP_FOLDER = $(ROOT)/usr/lib/helm
-
-%:
-	dh $@
-
-override_dh_auto_build:
-
-	cp Makefile helm
-	cd helm && make csi-powerstore
-
-override_dh_auto_install:
-	# Install the app tar file.
-	install -d -m 755 $(APP_FOLDER)
-	install -p -D -m 755 helm/csi-powerstore*.tgz $(APP_FOLDER)
-
-override_dh_auto_test:

csi-powerstore-helm/debian/meta_data.yaml

@@ -1,14 +0,0 @@
----
-debname: csi-powerstore-helm
-debver: 2.7-0
-dl_path:
-  name: csi-powerstore-2.7.0.tar.gz
-  url: https://github.com/dell/csi-powerstore/archive/v2.7.0.tar.gz
-  sha256sum: edb4843f0460f9c73764c1bef9bfadaa945557feaa74945c6083f75e91fcc697
-src_files:
-  - csi-powerstore-helm/files/Makefile
-revision:
-  dist: $STX_DIST
-  GITREVCOUNT:
-    BASE_SRCREV: 8db8f63466df064069133380243443e3822fa8ce
-    SRC_DIR: ${MY_REPO}/stx/app-dell-storage/csi-powerstore-helm

csi-unity-helm/debian/deb_folder/rules

@@ -1,20 +0,0 @@
-#!/usr/bin/make -f
-export DH_VERBOSE = 1
-
-export ROOT = debian/tmp
-export APP_FOLDER = $(ROOT)/usr/lib/helm
-
-%:
-	dh $@
-
-override_dh_auto_build:
-
-	cp Makefile helm
-	cd helm && make csi-unity
-
-override_dh_auto_install:
-	# Install the app tar file.
-	install -d -m 755 $(APP_FOLDER)
-	install -p -D -m 755 helm/csi-unity*.tgz $(APP_FOLDER)
-
-override_dh_auto_test:

csm-observability-helm/debian/deb_folder/rules

@@ -1,20 +0,0 @@
-#!/usr/bin/make -f
-export DH_VERBOSE = 1
-
-export ROOT = debian/tmp
-export APP_FOLDER = $(ROOT)/usr/lib/helm
-
-%:
-	dh $@
-
-override_dh_auto_build:
-
-	cp Makefile charts
-	cd charts && make karavi-observability
-
-override_dh_auto_install:
-	# Install the app tar file.
-	install -d -m 755 $(APP_FOLDER)
-	install -p -D -m 755 charts/karavi-observability*.tgz $(APP_FOLDER)
-
-override_dh_auto_test:

csm-replication-helm/debian/deb_folder/rules

@@ -1,20 +0,0 @@
-#!/usr/bin/make -f
-export DH_VERBOSE = 1
-
-export ROOT = debian/tmp
-export APP_FOLDER = $(ROOT)/usr/lib/helm
-
-%:
-	dh $@
-
-override_dh_auto_build:
-
-	cp Makefile helm
-	cd helm && make csm-replication
-
-override_dh_auto_install:
-	# Install the app tar file.
-	install -d -m 755 $(APP_FOLDER)
-	install -p -D -m 755 helm/csm-replication*.tgz $(APP_FOLDER)
-
-override_dh_auto_test:

debian_pkg_dirs

@@ -1,7 +1,7 @@
-csi-powerstore-helm
-csi-unity-helm
-csm-replication-helm
-csm-observability-helm
-csm-application-mobility-helm
+helm-charts/upstream/csi-powerstore-helm
+helm-charts/upstream/csi-unity-helm
+helm-charts/upstream/csm-replication-helm
+helm-charts/upstream/csm-observability-helm
+helm-charts/upstream/csm-application-mobility-helm
 python3-k8sapp-dell-storage
 stx-dell-storage-helm

helm-charts/upstream/csi-powerstore-helm/csi-powerstore-helm/files/Makefile

@@ -1,7 +1,7 @@
 #
 # Copyright 2017 The Openstack-Helm Authors.
 #
-# Copyright (c) 2023 Wind River Systems, Inc.
+# Copyright (c) 2023-2024 Wind River Systems, Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -30,12 +30,11 @@ lint-%: init-%
 	if [ -d $* ]; then helm lint $*; fi
 
 build-%: lint-%
-	if [ -d $* ]; then helm package $*; fi
+	if [ -d $* ]; then helm package --version $(CHART_VERSION) $*; fi
 
 clean:
 	@echo "Clean all build artifacts"
 	rm -f */templates/_partials.tpl */templates/_globals.tpl
-	rm -f *tgz */charts/*tgz
 	rm -rf */charts */tmpcharts
 
 %:

helm-charts/upstream/csi-powerstore-helm/debian/deb_folder/changelog

@@ -1,3 +1,9 @@
+csi-powerstore-helm (2.9-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ --  Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>  Fri, 23 Feb 2024 14:30:00 +0000
+
 csi-powerstore-helm (2.7-0) unstable; urgency=medium
 
   * New upstream release.

helm-charts/upstream/csi-powerstore-helm/debian/deb_folder/copyright

@@ -3,7 +3,7 @@ Upstream-Name: csi-powerstore-helm
 Source: https://opendev.org/starlingx/app-dell-storage/
 
 Files: *
-Copyright: (c) 2023 Wind River Systems, Inc
+Copyright: (c) 2023-2024 Wind River Systems, Inc
 License: Apache-2
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ License: Apache-2
 # If you want to use GPL v2 or later for the /debian/* files use
 # the following clauses, or change it to suit. Delete these two lines
 Files: debian/*
-Copyright: 2022 Wind River Systems, Inc
+Copyright: 2022-2024 Wind River Systems, Inc
 License: Apache-2
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

helm-charts/upstream/csi-powerstore-helm/debian/deb_folder/patches/0001-csi-powerstore-add-default-values-for-templates.patch

@@ -0,0 +1,166 @@
+From ce15b8bb5558478c9266ee2cb13f6fa307386219 Mon Sep 17 00:00:00 2001
+From: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
+Date: Mon, 26 Feb 2024 10:04:37 -0300
+Subject: [PATCH] csi-powerstore: add default values for templates
+
+This patch consists of adding the default values in the values.yaml of
+the helm chart.
+It's necessary because the images in templates were in unexpected format
+for the system and because templates need default values to be able
+to build the package.
+
+Signed-off-by: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
+---
+ charts/csi-powerstore/values.yaml | 77 +++++++++++++++++++++++--------
+ 1 file changed, 59 insertions(+), 18 deletions(-)
+
+diff --git a/charts/csi-powerstore/values.yaml b/charts/csi-powerstore/values.yaml
+index 500e333..aff4471 100644
+--- a/charts/csi-powerstore/values.yaml
++++ b/charts/csi-powerstore/values.yaml
+@@ -25,24 +25,11 @@ driverName: "csi-powerstore.dellemc.com"
+ # Not recommend to change
+ version: v2.9.1
+ 
+-# "images" defines every container images used for the driver and its sidecars.
+-#  To use your own images, or a private registry, change the values here.
+-images:
+-  # "driver" defines the container image, used for the driver container.
+-  driver: dellemc/csi-powerstore:v2.9.1
+-  # CSI sidecars
+-  attacher: registry.k8s.io/sig-storage/csi-attacher:v4.4.2
+-  provisioner: registry.k8s.io/sig-storage/csi-provisioner:v3.6.2
+-  snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2
+-  resizer: registry.k8s.io/sig-storage/csi-resizer:v1.9.2
+-  registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1
+-  healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.10.0
+-
+-  # CSM sidecars
+-  replication: dellemc/dell-csi-replicator:v1.7.1
+-  vgsnapshotter: dellemc/csi-volumegroup-snapshotter:v1.4.0
+-  podmon: dellemc/podmon:v1.8.1
+-  metadataretriever: dellemc/csi-metadata-retriever:v1.6.1
++driver:
++  # image: Image to use for driver sidecar. This shouldn't be changed
++  # Allowed values: string
++  # Default value: docker.io/dellemc/csi-powerstore:v2.9.1
++  image: docker.io/dellemc/csi-powerstore:v2.9.1
+ 
+ # Specify kubelet config dir path.
+ # Ensure that the config.yaml file is present at this path.
+@@ -113,6 +100,24 @@ controller:
+   # Default value: None
+   volumeNamePrefix: csivol
+ 
++  attacher:
++    # image: Image to use for attacher sidecar. This shouldn't be changed
++    # Allowed values: string
++    # Default value: registry.k8s.io/sig-storage/csi-attacher:v4.4.2
++    image: registry.k8s.io/sig-storage/csi-attacher:v4.4.2
++
++  provisioner:
++    # image: Image to use for provisioner sidecar. This shouldn't be changed
++    # Allowed values: string
++    # Default value: registry.k8s.io/sig-storage/csi-provisioner:v3.6.2
++    image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.2
++
++  metadataretriever:
++    # image: Image to use for csi-metadata-retriever sidecar. This shouldn't be changed
++    # Allowed values: string
++    # Default value: docker.io/dellemc/csi-metadata-retriever:v1.6.1
++    image: docker.io/dellemc/csi-metadata-retriever:v1.6.1
++
+   # vgsnapshot: allows to configure volume-group-snapshot
+   # volume-group-snapshot CRDs must be installed before installing driver
+   vgsnapshot:
+@@ -123,6 +128,11 @@ controller:
+     # Default value: false
+     enabled: false
+ 
++    # image: Image to use for vg-snapshotter sidecar. This shouldn't be changed
++    # Allowed values: string
++    # Default value: docker.io/dellemc/csi-volumegroup-snapshotter:v1.4.0
++    image: docker.io/dellemc/csi-volumegroup-snapshotter:v1.4.0
++
+   # snapshot: allows to enable/disable snapshot feature
+   # snapshot CRDs needs to be installed before enabling this feature
+   snapshot:
+@@ -137,6 +147,12 @@ controller:
+     # Allowed values: string
+     # Default value: None
+     snapNamePrefix: csisnap
++
++    # image: Image to use for snapshotter sidecar. This shouldn't be changed
++    # Allowed values: string
++    # Default value: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2
++    image: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2
++
+   # resizer: allows to enable/disable resizer feature
+   resizer:
+     # enabled: Enable/Disable volume expansion feature
+@@ -145,6 +161,10 @@ controller:
+     #   false: disable volume expansion feature(do not install resizer sidecar)
+     # Default value: true
+     enabled: true
++    # image: Image to use for resizer sidecar. This shouldn't be changed
++    # Allowed values: string
++    # Default value: registry.k8s.io/sig-storage/csi-resizer:v1.9.2
++    image: registry.k8s.io/sig-storage/csi-resizer:v1.9.2
+ 
+   healthMonitor:
+     # enabled: Enable/Disable health monitor of CSI volumes
+@@ -160,6 +180,11 @@ controller:
+     # Default value: 60s
+     interval: 60s
+ 
++    # image: Image to use for csi-external-health-monitor-controller sidecar. This shouldn't be changed
++    # Allowed values: string
++    # Default value: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.10.0
++    image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.10.0
++
+   # replication: allows to configure replication
+   # Replication CRDs must be installed before installing driver
+   replication:
+@@ -180,6 +205,11 @@ controller:
+     # Default value: replication.storage.dell.com
+     replicationPrefix: "replication.storage.dell.com"
+ 
++    # image: Image to use for dell-csi-replicator sidecar. This shouldn't be changed
++    # Allowed values: string
++    # Default value: docker.io/dellemc/dell-csi-replicator:v1.7.1
++    image: docker.io/dellemc/dell-csi-replicator:v1.7.1
++
+   # nodeSelector: Define node selection constraints for controller pods.
+   # For the pod to be eligible to run on a node, the node must have each
+   # of the indicated key-value pairs as labels.
+@@ -218,6 +248,12 @@ node:
+   # Default value: None
+   nodeIDPath: /etc/machine-id
+ 
++  registrar:
++    # image: Image to use for registrar sidecar. This shouldn't be changed
++    # Allowed values: string
++    # Default value: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1
++    image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1
++
+   healthMonitor:
+     # enabled: Enable/Disable health monitor of CSI volumes- volume usage, volume condition
+     # Allowed values:
+@@ -325,6 +361,7 @@ storageCapacity:
+ # Enable this feature only after contact support for additional information
+ podmon:
+   enabled: false
++  image: docker.io/dellemc/podmon:v1.8.1
+   controller:
+     args:
+       - "--csisock=unix:/var/run/csi/csi.sock"
+@@ -348,3 +385,7 @@ podmon:
+       - "--driver-config-params=/powerstore-config-params/driver-config-params.yaml"
+       - "--driverPodLabelValue=dell-storage"
+       - "--ignoreVolumelessPods=false"
++
++storageClasses:
++
++secret:
+-- 
+2.34.1

helm-charts/upstream/csi-powerstore-helm/debian/deb_folder/patches/0002-csi-powerstore-add-secret-in-templates.patch

@@ -1,29 +1,29 @@
-From a9d0bf4c572404b6f0fbf5cced132e4d5cd561df Mon Sep 17 00:00:00 2001
-From: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
-Date: Wed, 13 Sep 2023 14:29:55 -0300
+From 359ef72af1b4179d8354ed0ffbee10b5963441a7 Mon Sep 17 00:00:00 2001
+From: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
+Date: Mon, 26 Feb 2024 10:15:38 -0300
 Subject: [PATCH] csi-powerstore: add secret in templates
 
 This patch consists of adding a secret in the helm chart templates directory.
 It's needed because this helm chart needs a config secret that should be
 created manually.
 
-Signed-off-by: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
+Signed-off-by: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
 ---
- helm/csi-powerstore/templates/secret.yaml | 21 +++++++++++++++++++++
+ charts/csi-powerstore/templates/secret.yaml | 21 +++++++++++++++++++++
  1 file changed, 21 insertions(+)
- create mode 100644 helm/csi-powerstore/templates/secret.yaml
+ create mode 100644 charts/csi-powerstore/templates/secret.yaml
 
-diff --git a/helm/csi-powerstore/templates/secret.yaml b/helm/csi-powerstore/templates/secret.yaml
+diff --git a/charts/csi-powerstore/templates/secret.yaml b/charts/csi-powerstore/templates/secret.yaml
 new file mode 100644
-index 0000000..4cb7e69
+index 0000000..40ab5c6
 --- /dev/null
-+++ b/helm/csi-powerstore/templates/secret.yaml
++++ b/charts/csi-powerstore/templates/secret.yaml
 @@ -0,0 +1,21 @@
-+{{- if .Values.secret.create }}
++{{- if .Values.secret }}
 +apiVersion: v1
 +kind: Secret
 +metadata:
-+  name: csi-powerstore-config
++  name: {{ .Release.Name }}-config
 +  namespace: {{ .Release.Namespace }}
 +stringData:
 +  config: |
@@ -41,4 +41,4 @@ index 0000000..4cb7e69
 +      {{- end }}
 +{{- end }}
 -- 
-2.25.1
+2.34.1

helm-charts/upstream/csi-powerstore-helm/debian/deb_folder/patches/0003-csi-powerstore-add-storageclass-in-templates.patch

@@ -1,23 +1,23 @@
-From 7f01cd3a57085883ed3696655b5d5c49beee26f9 Mon Sep 17 00:00:00 2001
-From: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
-Date: Wed, 13 Sep 2023 14:55:39 -0300
+From 51021e130db083ba2bcb3ed3c02609fd2eff5573 Mon Sep 17 00:00:00 2001
+From: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
+Date: Mon, 26 Feb 2024 10:22:20 -0300
 Subject: [PATCH] csi-powerstore: add storageclass in templates
 
 This patch consists of adding a storage classes in the helm chart templates directory.
 It's needed because this helm chart needs a storage classes that should be
 created manually.
 
-Signed-off-by: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
+Signed-off-by: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
 ---
  .../templates/storageclass.yaml               | 43 +++++++++++++++++++
  1 file changed, 43 insertions(+)
- create mode 100644 helm/csi-powerstore/templates/storageclass.yaml
+ create mode 100644 charts/csi-powerstore/templates/storageclass.yaml
 
-diff --git a/helm/csi-powerstore/templates/storageclass.yaml b/helm/csi-powerstore/templates/storageclass.yaml
+diff --git a/charts/csi-powerstore/templates/storageclass.yaml b/charts/csi-powerstore/templates/storageclass.yaml
 new file mode 100644
 index 0000000..2bce0cd
 --- /dev/null
-+++ b/helm/csi-powerstore/templates/storageclass.yaml
++++ b/charts/csi-powerstore/templates/storageclass.yaml
 @@ -0,0 +1,43 @@
 +{{- range $sc := .Values.storageClasses }}
 +apiVersion: storage.k8s.io/v1
@@ -63,4 +63,4 @@ index 0000000..2bce0cd
 +---
 +{{- end }}
 -- 
-2.25.1
+2.34.1

helm-charts/upstream/csi-powerstore-helm/debian/deb_folder/patches/0004-csi-powerstore-fix-image-path-for-templates.patch

@@ -0,0 +1,141 @@
+From 581dbe6066d5a895f6dea725ac1eae7ab8e8f5e5 Mon Sep 17 00:00:00 2001
+From: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
+Date: Mon, 26 Feb 2024 11:33:37 -0300
+Subject: [PATCH] csi-powerstore: fix image path for templates
+
+This patch consists of changing the format to use the image path directly
+following the expected format used by kube_app.
+
+Signed-off-by: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
+---
+ .../csi-powerstore/templates/controller.yaml  | 20 +++++++++----------
+ charts/csi-powerstore/templates/node.yaml     |  6 +++---
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/charts/csi-powerstore/templates/controller.yaml b/charts/csi-powerstore/templates/controller.yaml
+index 968ccf6..22b45f9 100644
+--- a/charts/csi-powerstore/templates/controller.yaml
++++ b/charts/csi-powerstore/templates/controller.yaml
+@@ -197,7 +197,7 @@ spec:
+         {{- if hasKey .Values "podmon" }}
+         {{- if eq .Values.podmon.enabled true }}
+         - name: podmon
+-          image: {{ required "Must provide the podmon container image." .Values.images.podmon }}
++          image: {{ required "Must provide the podmon container image." .Values.podmon.image }}
+           imagePullPolicy: {{ .Values.imagePullPolicy }}
+           args:
+             {{- toYaml .Values.podmon.controller.args | nindent 12 }}
+@@ -225,7 +225,7 @@ spec:
+         {{ if .Values.dev.enableTracing }}{{- include "pstore.tracing" . | nindent 8 }}{{ end }}
+         {{- end }}
+         - name: attacher
+-          image: {{ required "Must provide the CSI attacher container image." .Values.images.attacher }}
++          image: {{ required "Must provide the CSI attacher container image." .Values.controller.attacher.image }}
+           imagePullPolicy: {{ .Values.imagePullPolicy }}
+           args:
+             - "--csi-address=$(ADDRESS)"
+@@ -243,7 +243,7 @@ spec:
+         {{- if hasKey .Values.controller "resizer" }}
+         {{- if eq .Values.controller.resizer.enabled true }}
+         - name: resizer
+-          image: {{ required "Must provide the CSI resizer container image." .Values.images.resizer }}
++          image: {{ required "Must provide the CSI resizer container image." .Values.controller.resizer.image }}
+           imagePullPolicy: {{ .Values.imagePullPolicy }}
+           args:
+             - "--csi-address=$(ADDRESS)"
+@@ -258,7 +258,7 @@ spec:
+         {{end}}
+         {{end}}
+         - name: provisioner
+-          image: {{ required "Must provide the CSI provisioner container image." .Values.images.provisioner }}
++          image: {{ required "Must provide the CSI provisioner container image." .Values.controller.provisioner.image }}
+           imagePullPolicy: {{ .Values.imagePullPolicy }}
+           args:
+             - "--csi-address=$(ADDRESS)"
+@@ -289,7 +289,7 @@ spec:
+         {{- if hasKey .Values.controller "snapshot" }}
+         {{- if eq .Values.controller.snapshot.enabled true }}
+         - name: snapshotter
+-          image: {{ required "Must provide the CSI snapshotter container image." .Values.images.snapshotter }}
++          image: {{ required "Must provide the CSI snapshotter container image." .Values.controller.snapshot.image }}
+           imagePullPolicy: {{ .Values.imagePullPolicy }}
+           args:
+             - "--csi-address=$(ADDRESS)"
+@@ -307,7 +307,7 @@ spec:
+         {{- if hasKey .Values.controller "vgsnapshot" }}
+         {{- if eq .Values.controller.vgsnapshot.enabled true }}
+         - name: vg-snapshotter
+-          image: {{ required "Must provide the vgsnapshotter container image." .Values.images.vgsnapshotter }}
++          image: {{ required "Must provide the vgsnapshotter container image." .Values.controller.vgsnapshot.image }}
+           imagePullPolicy: {{ .Values.imagePullPolicy }}
+           env:
+             - name: ADDRESS
+@@ -320,7 +320,7 @@ spec:
+         {{- if hasKey .Values.controller "replication" }}
+         {{- if eq .Values.controller.replication.enabled true}}
+         - name: dell-csi-replicator
+-          image: {{ required "Must provide the Dell CSI Replicator image." .Values.images.replication }}
++          image: {{ required "Must provide the Dell CSI Replicator image." .Values.controller.replication.image }}
+           imagePullPolicy: {{ .Values.imagePullPolicy }}
+           args:
+             - "--csi-address=$(ADDRESS)"
+@@ -348,7 +348,7 @@ spec:
+         {{- if hasKey .Values.controller "healthMonitor" }}
+         {{- if eq .Values.controller.healthMonitor.enabled true}}
+         - name: csi-external-health-monitor-controller
+-          image: {{ required "Must provide the CSI external health monitor controller image." .Values.images.healthmonitor }}
++          image: {{ required "Must provide the CSI external health monitor controller image." .Values.controller.healthMonitor.image }}
+           imagePullPolicy: {{ .Values.imagePullPolicy }}
+           args:
+             - "--v=5"
+@@ -367,7 +367,7 @@ spec:
+         {{- end }}
+         {{- end }}
+         - name: csi-metadata-retriever
+-          image: {{ required "Must provide the CSI Metadata retriever container image." .Values.images.metadataretriever }}
++          image: {{ required "Must provide the CSI Metadata retriever container image." .Values.controller.metadataretriever.image }}
+           imagePullPolicy: {{ .Values.imagePullPolicy }}
+           command: [ "/csi-metadata-retriever" ]
+           env:
+@@ -382,7 +382,7 @@ spec:
+             - name: socket-dir
+               mountPath: /var/run/csi
+         - name: driver
+-          image: {{ required "Must provide the PowerStore driver image repository." .Values.images.driver }}
++          image: {{ required "Must provide the PowerStore driver image repository." .Values.driver.image }}
+           imagePullPolicy: {{ .Values.imagePullPolicy }}
+           command: [ "/csi-powerstore" ]
+           env:
+diff --git a/charts/csi-powerstore/templates/node.yaml b/charts/csi-powerstore/templates/node.yaml
+index 1ee7969..47cd54e 100644
+--- a/charts/csi-powerstore/templates/node.yaml
++++ b/charts/csi-powerstore/templates/node.yaml
+@@ -120,7 +120,7 @@ spec:
+             capabilities:
+               add: ["SYS_ADMIN"]
+             allowPrivilegeEscalation: true
+-          image: {{ required "Must provide the podmon container image." .Values.images.podmon }}
++          image: {{ required "Must provide the podmon container image." .Values.podmon.image }}
+           imagePullPolicy: {{ .Values.imagePullPolicy }}
+           args:
+             {{- toYaml .Values.podmon.node.args | nindent 12 }}
+@@ -173,7 +173,7 @@ spec:
+             capabilities:
+               add: ["SYS_ADMIN"]
+             allowPrivilegeEscalation: true
+-          image: {{ required "Must provide the Powerstore driver image repository." .Values.images.driver }}
++          image: {{ required "Must provide the Powerstore driver image repository." .Values.driver.image }}
+           imagePullPolicy: {{ .Values.imagePullPolicy }}
+           command: [ "/csi-powerstore" ]
+           env:
+@@ -266,7 +266,7 @@ spec:
+             - name: powerstore-config-params
+               mountPath: /powerstore-config-params
+         - name: registrar
+-          image: {{ required "Must provide the CSI node registrar container image." .Values.images.registrar }}
++          image: {{ required "Must provide the CSI node registrar container image." .Values.node.registrar.image }}
+           imagePullPolicy: {{ .Values.imagePullPolicy }}
+           args:
+             - "--v=5"
+-- 
+2.34.1

helm-charts/upstream/csi-powerstore-helm/debian/deb_folder/patches/0005-csi-powerstore-fix-pull-image-error.patch

@@ -1,6 +1,6 @@
-From f503be00bbb03b30fda3c8f4ab4b4ca1d1ac7ac9 Mon Sep 17 00:00:00 2001
+From 6d60351cffc161790124e9bca957692bed1e4dea Mon Sep 17 00:00:00 2001
 From: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
-Date: Thu, 20 Apr 2023 09:05:14 -0300
+Date: Mon, 26 Feb 2024 11:37:21 -0300
 Subject: [PATCH] csi-powerstore: fix pull image error
 
 This patch consists of adding imagePullSecrets with name
@@ -9,16 +9,15 @@ It's necessary because without it the system can't use the
 images from the registry local.
 
 Signed-off-by: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
-Signed-off-by: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
 ---
- helm/csi-powerstore/templates/controller.yaml | 2 ++
- helm/csi-powerstore/templates/node.yaml       | 2 ++
+ charts/csi-powerstore/templates/controller.yaml | 2 ++
+ charts/csi-powerstore/templates/node.yaml       | 2 ++
  2 files changed, 4 insertions(+)
 
-diff --git a/helm/csi-powerstore/templates/controller.yaml b/helm/csi-powerstore/templates/controller.yaml
-index 097084b..73211b0 100644
---- a/helm/csi-powerstore/templates/controller.yaml
-+++ b/helm/csi-powerstore/templates/controller.yaml
+diff --git a/charts/csi-powerstore/templates/controller.yaml b/charts/csi-powerstore/templates/controller.yaml
+index 22b45f9..274e4ee 100644
+--- a/charts/csi-powerstore/templates/controller.yaml
++++ b/charts/csi-powerstore/templates/controller.yaml
 @@ -19,6 +19,8 @@ kind: ServiceAccount
  metadata:
    name: {{ .Release.Name }}-controller
@@ -28,10 +27,10 @@ index 097084b..73211b0 100644
  
  ---
  
-diff --git a/helm/csi-powerstore/templates/node.yaml b/helm/csi-powerstore/templates/node.yaml
-index 643293f..a5f2b29 100644
---- a/helm/csi-powerstore/templates/node.yaml
-+++ b/helm/csi-powerstore/templates/node.yaml
+diff --git a/charts/csi-powerstore/templates/node.yaml b/charts/csi-powerstore/templates/node.yaml
+index 47cd54e..f4c1c12 100644
+--- a/charts/csi-powerstore/templates/node.yaml
++++ b/charts/csi-powerstore/templates/node.yaml
 @@ -19,6 +19,8 @@ kind: ServiceAccount
  metadata:
    name: {{ .Release.Name }}-node
@@ -42,4 +41,4 @@ index 643293f..a5f2b29 100644
  ---
  
 -- 
-2.25.1
+2.34.1

helm-charts/upstream/csi-powerstore-helm/debian/deb_folder/patches/0006-csi-powerstore-add-separator-after-comments.patch

@@ -0,0 +1,95 @@
+From 18cb357f91eabe4525d503e9db684c46ce23730d Mon Sep 17 00:00:00 2001
+From: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
+Date: Mon, 26 Feb 2024 11:42:50 -0300
+Subject: [PATCH] csi-powerstore: add separator after comments
+
+This patch consists of adding separator between header comments and
+the resources.
+It's necessary because the helm couldn't render the chart and it
+had been fixed by adding this separator that indicates when
+the resource starts.
+
+Signed-off-by: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
+---
+ charts/csi-powerstore/Chart.yaml                          | 3 +++
+ charts/csi-powerstore/templates/controller.yaml           | 2 ++
+ charts/csi-powerstore/templates/csidriver.yaml            | 2 ++
+ charts/csi-powerstore/templates/driver-config-params.yaml | 4 +++-
+ charts/csi-powerstore/templates/node.yaml                 | 2 ++
+ 5 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/charts/csi-powerstore/Chart.yaml b/charts/csi-powerstore/Chart.yaml
+index ad2608f..fe50b42 100644
+--- a/charts/csi-powerstore/Chart.yaml
++++ b/charts/csi-powerstore/Chart.yaml
+@@ -13,6 +13,9 @@
+ # limitations under the License.
+ #
+ #
++
++---
++
+ apiVersion: v2
+ appVersion: "2.9.1"
+ name: csi-powerstore
+diff --git a/charts/csi-powerstore/templates/controller.yaml b/charts/csi-powerstore/templates/controller.yaml
+index 274e4ee..a717e65 100644
+--- a/charts/csi-powerstore/templates/controller.yaml
++++ b/charts/csi-powerstore/templates/controller.yaml
+@@ -14,6 +14,8 @@
+ #
+ #
+ 
++---
++
+ apiVersion: v1
+ kind: ServiceAccount
+ metadata:
+diff --git a/charts/csi-powerstore/templates/csidriver.yaml b/charts/csi-powerstore/templates/csidriver.yaml
+index 9f5ad9b..5bdf193 100644
+--- a/charts/csi-powerstore/templates/csidriver.yaml
++++ b/charts/csi-powerstore/templates/csidriver.yaml
+@@ -14,6 +14,8 @@
+ #
+ #
+ 
++---
++
+ apiVersion: storage.k8s.io/v1
+ kind: CSIDriver
+ metadata:
+diff --git a/charts/csi-powerstore/templates/driver-config-params.yaml b/charts/csi-powerstore/templates/driver-config-params.yaml
+index ce5349d..fcd3868 100644
+--- a/charts/csi-powerstore/templates/driver-config-params.yaml
++++ b/charts/csi-powerstore/templates/driver-config-params.yaml
+@@ -14,6 +14,8 @@
+ #
+ #
+ 
++---
++
+ apiVersion: v1
+ kind: ConfigMap
+ metadata:
+@@ -28,4 +30,4 @@ data:
+     PODMON_CONTROLLER_LOG_FORMAT: "{{ .Values.logFormat }}"
+     PODMON_NODE_LOG_LEVEL: "{{ .Values.logLevel }}"
+     PODMON_NODE_LOG_FORMAT: "{{ .Values.logFormat }}"
+-    {{ end }}
+\ No newline at end of file
++    {{ end }}
+diff --git a/charts/csi-powerstore/templates/node.yaml b/charts/csi-powerstore/templates/node.yaml
+index f4c1c12..a886579 100644
+--- a/charts/csi-powerstore/templates/node.yaml
++++ b/charts/csi-powerstore/templates/node.yaml
+@@ -14,6 +14,8 @@
+ #
+ #
+ 
++---
++
+ apiVersion: v1
+ kind: ServiceAccount
+ metadata:
+-- 
+2.34.1

helm-charts/upstream/csi-powerstore-helm/debian/deb_folder/patches/0007-csi-powerstore-enabling-csm-resiliency.patch

@@ -0,0 +1,148 @@
+From ff4743a16dd78a9340fae12f49fe6a6b083e2ffd Mon Sep 17 00:00:00 2001
+From: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
+Date: Mon, 26 Feb 2024 11:50:15 -0300
+Subject: [PATCH] csi-powerstore: enabling csm-resiliency
+
+This patch consists of changing the format of the values in templates and
+changing the values.yaml for the user be able to enable csm-resiliency.
+
+Signed-off-by: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
+---
+ charts/csi-powerstore/templates/controller.yaml      | 12 ++++++------
+ .../templates/driver-config-params.yaml              |  2 +-
+ charts/csi-powerstore/templates/node.yaml            | 12 ++++++------
+ charts/csi-powerstore/values.yaml                    |  4 ++++
+ 4 files changed, 17 insertions(+), 13 deletions(-)
+
+diff --git a/charts/csi-powerstore/templates/controller.yaml b/charts/csi-powerstore/templates/controller.yaml
+index a717e65..c2007d7 100644
+--- a/charts/csi-powerstore/templates/controller.yaml
++++ b/charts/csi-powerstore/templates/controller.yaml
+@@ -40,7 +40,7 @@ rules:
+   - apiGroups: [""]
+     resources: ["nodes"]
+   {{- if hasKey .Values "podmon" }}
+-  {{- if eq .Values.podmon.enabled true }}
++  {{- if or .Values.podmon.enabled .Values.csm.resiliency }}
+     verbs: ["get", "list", "watch", "patch"]
+   {{- else }}
+     verbs: ["get", "list", "watch"]
+@@ -58,7 +58,7 @@ rules:
+   - apiGroups: ["storage.k8s.io"]
+     resources: ["volumeattachments"]
+   {{- if hasKey .Values "podmon" }}
+-  {{- if eq .Values.podmon.enabled true }}
++  {{- if or .Values.podmon.enabled .Values.csm.resiliency }}
+     verbs: ["get", "list", "watch", "update", "patch", "delete"]
+   {{- else }}
+     verbs: ["get", "list", "watch", "update", "patch"]
+@@ -98,7 +98,7 @@ rules:
+   - apiGroups: [""]
+     resources: ["pods"]
+   {{- if hasKey .Values "podmon" }}
+-  {{- if eq .Values.podmon.enabled true }}
++  {{- if or .Values.podmon.enabled .Values.csm.resiliency }}
+     verbs: ["get", "list", "watch", "update", "delete"]
+   {{- else }}
+     verbs: ["get", "list", "watch"]
+@@ -199,7 +199,7 @@ spec:
+               topologyKey: "kubernetes.io/hostname"
+       containers:
+         {{- if hasKey .Values "podmon" }}
+-        {{- if eq .Values.podmon.enabled true }}
++        {{- if or .Values.podmon.enabled .Values.csm.resiliency }}
+         - name: podmon
+           image: {{ required "Must provide the podmon container image." .Values.podmon.image }}
+           imagePullPolicy: {{ .Values.imagePullPolicy }}
+@@ -413,8 +413,8 @@ spec:
+               value: /powerstore-config-params/driver-config-params.yaml
+             {{- if hasKey .Values "podmon" }}
+             - name: X_CSI_PODMON_ENABLED
+-              value: "{{ .Values.podmon.enabled }}"
+-            {{- if eq .Values.podmon.enabled true }}
++              value: "{{ or .Values.podmon.enabled .Values.csm.resiliency }}"
++            {{- if or .Values.podmon.enabled .Values.csm.resiliency }}
+               {{- range $key, $value := .Values.podmon.controller.args }}
+                 {{- if contains "--arrayConnectivityPollRate" $value }}
+             - name: X_CSI_PODMON_ARRAY_CONNECTIVITY_POLL_RATE
+diff --git a/charts/csi-powerstore/templates/driver-config-params.yaml b/charts/csi-powerstore/templates/driver-config-params.yaml
+index fcd3868..8531ef1 100644
+--- a/charts/csi-powerstore/templates/driver-config-params.yaml
++++ b/charts/csi-powerstore/templates/driver-config-params.yaml
+@@ -25,7 +25,7 @@ data:
+   driver-config-params.yaml: |
+     CSI_LOG_LEVEL: "{{ .Values.logLevel }}"
+     CSI_LOG_FORMAT: "{{ .Values.logFormat }}"
+-    {{ if .Values.podmon.enabled }}
++    {{ if or .Values.podmon.enabled .Values.csm.resiliency }}
+     PODMON_CONTROLLER_LOG_LEVEL: "{{ .Values.logLevel }}"
+     PODMON_CONTROLLER_LOG_FORMAT: "{{ .Values.logFormat }}"
+     PODMON_NODE_LOG_LEVEL: "{{ .Values.logLevel }}"
+diff --git a/charts/csi-powerstore/templates/node.yaml b/charts/csi-powerstore/templates/node.yaml
+index a886579..04bb072 100644
+--- a/charts/csi-powerstore/templates/node.yaml
++++ b/charts/csi-powerstore/templates/node.yaml
+@@ -57,7 +57,7 @@ rules:
+     resources: ["securitycontextconstraints"]
+     verbs: ["use"]
+   {{- if hasKey .Values "podmon" }}
+-  {{- if eq .Values.podmon.enabled true }}
++  {{- if or .Values.podmon.enabled .Values.csm.resiliency }}
+   - apiGroups: [""]
+     resources: ["pods"]
+     verbs: ["get", "list", "watch", "update", "delete"]
+@@ -97,7 +97,7 @@ spec:
+     metadata:
+       labels:
+         app: {{ .Release.Name }}-node
+-      {{- if .Values.podmon.enabled }}
++      {{- if or .Values.podmon.enabled .Values.csm.resiliency }}
+         driver.dellemc.com: dell-storage
+       {{- end }}
+       annotations:
+@@ -117,7 +117,7 @@ spec:
+       hostIPC: true
+       containers:
+       {{- if hasKey .Values "podmon" }}
+-      {{- if eq .Values.podmon.enabled true }}
++      {{- if or .Values.podmon.enabled .Values.csm.resiliency }}
+         - name: podmon
+           securityContext:
+             privileged: true
+@@ -230,8 +230,8 @@ spec:
+             {{- end }}
+             {{- if hasKey .Values "podmon" }}
+             - name: X_CSI_PODMON_ENABLED
+-              value: "{{ .Values.podmon.enabled }}"
+-            {{- if eq .Values.podmon.enabled true }}
++              value: "{{ or .Values.podmon.enabled .Values.csm.resiliency }}"
++            {{- if or .Values.podmon.enabled .Values.csm.resiliency }}
+               {{- range $key, $value := .Values.podmon.node.args }}
+                 {{- if contains "--arrayConnectivityPollRate" $value }}
+             - name: X_CSI_PODMON_ARRAY_CONNECTIVITY_POLL_RATE
+@@ -340,7 +340,7 @@ spec:
+           secret:
+             secretName: {{ .Release.Name }}-config
+         {{- if hasKey .Values "podmon" }}
+-        {{- if eq .Values.podmon.enabled true }}
++        {{- if or .Values.podmon.enabled .Values.csm.resiliency }}
+         - name: usr-bin
+           hostPath:
+             path: /usr/bin
+diff --git a/charts/csi-powerstore/values.yaml b/charts/csi-powerstore/values.yaml
+index aff4471..fd9daf2 100644
+--- a/charts/csi-powerstore/values.yaml
++++ b/charts/csi-powerstore/values.yaml
+@@ -14,6 +14,10 @@
+ #
+ #
+ 
++# CSM Control
++csm:
++  resiliency: false
++
+ ## K8S/DRIVER ATTRIBUTES
+ ########################
+ 
+-- 
+2.34.1

helm-charts/upstream/csi-powerstore-helm/debian/deb_folder/patches/0008-csi-powerstore-enabling-csm-replication.patch

@@ -0,0 +1,59 @@
+From 02373eaca6451efd9e93531c958a36d98af535cd Mon Sep 17 00:00:00 2001
+From: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
+Date: Mon, 26 Feb 2024 12:04:04 -0300
+Subject: [PATCH] csi-powerstore: enabling csm-replication
+
+This patch consists of changing the format of the values in templates and
+changing the values.yaml for the user be able to enable csm-replication.
+
+Signed-off-by: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
+---
+ charts/csi-powerstore/templates/controller.yaml | 6 +++---
+ charts/csi-powerstore/values.yaml               | 1 +
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/charts/csi-powerstore/templates/controller.yaml b/charts/csi-powerstore/templates/controller.yaml
+index c2007d7..e827b7f 100644
+--- a/charts/csi-powerstore/templates/controller.yaml
++++ b/charts/csi-powerstore/templates/controller.yaml
+@@ -116,7 +116,7 @@ rules:
+     verbs: ["update", "patch"]
+   # below for dell-csi-replicator
+   {{- if hasKey .Values.controller "replication" }}
+-  {{- if eq .Values.controller.replication.enabled true}}
++  {{- if or .Values.csm.replication .Values.controller.replication.enabled }}
+   - apiGroups: ["replication.storage.dell.com"]
+     resources: ["dellcsireplicationgroups"]
+     verbs: ["create", "delete", "get", "list", "patch", "update", "watch"]
+@@ -322,7 +322,7 @@ spec:
+         {{- end }}
+         {{- end }}
+         {{- if hasKey .Values.controller "replication" }}
+-        {{- if eq .Values.controller.replication.enabled true}}
++        {{- if or .Values.csm.replication .Values.controller.replication.enabled }}
+         - name: dell-csi-replicator
+           image: {{ required "Must provide the Dell CSI Replicator image." .Values.controller.replication.image }}
+           imagePullPolicy: {{ .Values.imagePullPolicy }}
+@@ -426,7 +426,7 @@ spec:
+             - name: X_CSI_PODMON_API_PORT
+               value: "{{ .Values.podmonAPIPort }}"
+             {{- if hasKey .Values.controller "replication" }}
+-            {{- if eq .Values.controller.replication.enabled true}}
++            {{- if or .Values.csm.replication .Values.controller.replication.enabled }}
+             - name: X_CSI_REPLICATION_CONTEXT_PREFIX
+               value: {{ .Values.controller.replication.replicationContextPrefix | default "powerstore"}}
+             - name: X_CSI_REPLICATION_PREFIX
+diff --git a/charts/csi-powerstore/values.yaml b/charts/csi-powerstore/values.yaml
+index fd9daf2..fb9d20b 100644
+--- a/charts/csi-powerstore/values.yaml
++++ b/charts/csi-powerstore/values.yaml
+@@ -16,6 +16,7 @@
+ 
+ # CSM Control
+ csm:
++  replication: false
+   resiliency: false
+ 
+ ## K8S/DRIVER ATTRIBUTES
+-- 
+2.34.1

helm-charts/upstream/csi-powerstore-helm/debian/deb_folder/patches/0009-csi-powerstore-add-label-app.starlingx.io-component.patch

@@ -1,6 +1,6 @@
-From 54c0c2ee9e8de68e4f7d3170131beb95d2f05106 Mon Sep 17 00:00:00 2001
-From: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
-Date: Fri, 23 Jun 2023 11:09:38 -0300
+From 54a064291cf160b404a697d0b4b77951ec158602 Mon Sep 17 00:00:00 2001
+From: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
+Date: Tue, 27 Feb 2024 14:53:49 -0300
 Subject: [PATCH] csi-powerstore: add label app.starlingx.io/component
 
 This patch consists of changing the strategy from the Deployment resource and
@@ -9,17 +9,16 @@ The strategy was needed changing because in the reapply the old replicasets
 were not being deleted. The default value was rollingUpdate.
 In this case, it doesn't effect functionality.
 
-Signed-off-by: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
 Signed-off-by: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
 ---
- helm/csi-powerstore/templates/controller.yaml | 3 +++
- helm/csi-powerstore/templates/node.yaml       | 1 +
+ charts/csi-powerstore/templates/controller.yaml | 3 +++
+ charts/csi-powerstore/templates/node.yaml       | 1 +
  2 files changed, 4 insertions(+)
 
-diff --git a/helm/csi-powerstore/templates/controller.yaml b/helm/csi-powerstore/templates/controller.yaml
-index 3ff2838..a285766 100644
---- a/helm/csi-powerstore/templates/controller.yaml
-+++ b/helm/csi-powerstore/templates/controller.yaml
+diff --git a/charts/csi-powerstore/templates/controller.yaml b/charts/csi-powerstore/templates/controller.yaml
+index e827b7f..27a5c5d 100644
+--- a/charts/csi-powerstore/templates/controller.yaml
++++ b/charts/csi-powerstore/templates/controller.yaml
 @@ -171,10 +171,13 @@ spec:
    {{- else }}
    replicas: {{ required "Must provide the number of controller instances to create." .Values.controller.controllerCount }}
@@ -31,20 +30,20 @@ index 3ff2838..a285766 100644
        labels:
          name: {{ .Release.Name }}-controller
 +        app.starlingx.io/component: {{ index .Values "app.starlingx.io/component" }}
+       annotations:
+         kubectl.kubernetes.io/default-container: driver
      spec:
-       {{ if .Values.controller.nodeSelector }}
-       nodeSelector:
-diff --git a/helm/csi-powerstore/templates/node.yaml b/helm/csi-powerstore/templates/node.yaml
-index 3efa533..39d01bd 100644
---- a/helm/csi-powerstore/templates/node.yaml
-+++ b/helm/csi-powerstore/templates/node.yaml
+diff --git a/charts/csi-powerstore/templates/node.yaml b/charts/csi-powerstore/templates/node.yaml
+index 04bb072..05a7572 100644
+--- a/charts/csi-powerstore/templates/node.yaml
++++ b/charts/csi-powerstore/templates/node.yaml
 @@ -97,6 +97,7 @@ spec:
      metadata:
        labels:
          app: {{ .Release.Name }}-node
 +        app.starlingx.io/component: {{ index .Values "app.starlingx.io/component" }}
-       {{- if .Values.csm.resiliency }}
+       {{- if or .Values.podmon.enabled .Values.csm.resiliency }}
          driver.dellemc.com: dell-storage
        {{- end }}
 -- 
-2.25.1
+2.34.1

helm-charts/upstream/csi-powerstore-helm/debian/deb_folder/rules

@@ -0,0 +1,25 @@
+#!/usr/bin/make -f
+# export DH_VERBOSE = 1
+
+export DEB_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+export PATCH_VERSION = $(shell echo $(DEB_VERSION) | cut -f 4 -d '.')
+export CHART_BASE_VERSION = $(shell echo $(DEB_VERSION) | sed 's/-/./' | cut -d '.' -f 1-3)
+export CHART_VERSION = $(CHART_BASE_VERSION)+STX.$(PATCH_VERSION)
+
+export ROOT = debian/tmp
+export APP_FOLDER = $(ROOT)/usr/lib/helm
+
+%:
+	dh $@
+
+override_dh_auto_build:
+
+	cp Makefile charts
+	cd charts && make CHART_VERSION=$(CHART_VERSION) csi-powerstore
+
+override_dh_auto_install:
+	# Install the app tar file.
+	install -d -m 755 $(APP_FOLDER)
+	install -p -D -m 755 charts/csi-powerstore*.tgz $(APP_FOLDER)
+
+override_dh_auto_test:

helm-charts/upstream/csi-powerstore-helm/debian/meta_data.yaml

@@ -0,0 +1,15 @@
+---
+debname: csi-powerstore-helm
+debver: 2.9-1
+dl_path:
+  name: csi-powerstore-2.9.1.tar.gz
+  url: https://github.com/dell/helm-charts/archive/csi-powerstore-2.9.1.tar.gz
+  sha256sum: c0c53bd6c18b435c9c0a1d1b0803d83cdea7d7238b276efa8f6686c61bc55a18
+src_files:
+  - csi-powerstore-helm/files/Makefile
+revision:
+  dist: $STX_DIST
+  stx_patch: 0
+  GITREVCOUNT:
+    BASE_SRCREV: 8db8f63466df064069133380243443e3822fa8ce
+    SRC_DIR: ${MY_REPO}/stx/app-dell-storage/helm-charts/upstream/csi-powerstore-helm

helm-charts/upstream/csi-unity-helm/csi-unity-helm/files/Makefile

@@ -30,12 +30,11 @@ lint-%: init-%
 	if [ -d $* ]; then helm lint $*; fi
 
 build-%: lint-%
-	if [ -d $* ]; then helm package $*; fi
+	if [ -d $* ]; then helm package --version $(CHART_VERSION) $*; fi
 
 clean:
 	@echo "Clean all build artifacts"
 	rm -f */templates/_partials.tpl */templates/_globals.tpl
-	rm -f *tgz */charts/*tgz
 	rm -rf */charts */tmpcharts
 
 %:

helm-charts/upstream/csi-unity-helm/debian/deb_folder/rules

@@ -0,0 +1,25 @@
+#!/usr/bin/make -f
+#export DH_VERBOSE = 1
+
+export DEB_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+export PATCH_VERSION = $(shell echo $(DEB_VERSION) | cut -f 4 -d '.')
+export CHART_BASE_VERSION = $(shell echo $(DEB_VERSION) | sed 's/-/./' | cut -d '.' -f 1-3)
+export CHART_VERSION = $(CHART_BASE_VERSION)+STX.$(PATCH_VERSION)
+
+export ROOT = debian/tmp
+export APP_FOLDER = $(ROOT)/usr/lib/helm
+
+%:
+	dh $@
+
+override_dh_auto_build:
+
+	cp Makefile helm
+	cd helm && make CHART_VERSION=$(CHART_VERSION) csi-unity
+
+override_dh_auto_install:
+	# Install the app tar file.
+	install -d -m 755 $(APP_FOLDER)
+	install -p -D -m 755 helm/csi-unity*.tgz $(APP_FOLDER)
+
+override_dh_auto_test:

helm-charts/upstream/csi-unity-helm/debian/meta_data.yaml

@@ -9,6 +9,7 @@ src_files:
   - csi-unity-helm/files/Makefile
 revision:
   dist: $STX_DIST
+  stx_patch: 0
   GITREVCOUNT:
     BASE_SRCREV: 8db8f63466df064069133380243443e3822fa8ce
-    SRC_DIR: ${MY_REPO}/stx/app-dell-storage/csi-unity-helm
+    SRC_DIR: ${MY_REPO}/stx/app-dell-storage/helm-charts/upstream/csi-unity-helm

helm-charts/upstream/csm-application-mobility-helm/csm-application-mobility-helm/files/Makefile

@@ -30,11 +30,10 @@ lint-%: init-%
 	if [ -d $* ]; then helm lint $*; fi
 
 build-%: lint-%
-	if [ -d $* ]; then helm package $*; fi
+	if [ -d $* ]; then helm package --version $(CHART_VERSION) $*; fi
 
 clean:
 	rm -f */templates/_partials.tpl */templates/_globals.tpl
-	rm -f *tgz */charts/*tgz
 	rm -rf */charts */tmpcharts
 
 %:

helm-charts/upstream/csm-application-mobility-helm/debian/deb_folder/rules

@@ -1,5 +1,10 @@
 #!/usr/bin/make -f
-export DH_VERBOSE = 1
+#export DH_VERBOSE = 1
+
+export DEB_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+export PATCH_VERSION = $(shell echo $(DEB_VERSION) | cut -f 4 -d '.')
+export CHART_BASE_VERSION = $(shell echo $(DEB_VERSION) | sed 's/-/./' | cut -d '.' -f 1-3)
+export CHART_VERSION = $(CHART_BASE_VERSION)+STX.$(PATCH_VERSION)
 
 export ROOT = debian/tmp
 export APP_FOLDER = $(ROOT)/usr/lib/helm
@@ -21,7 +26,7 @@ override_dh_auto_build:
 
 	# building csm
 	cp Makefile charts
-	cd charts && make csm-application-mobility
+	cd charts && make CHART_VERSION=$(CHART_VERSION) csm-application-mobility
 
 override_dh_auto_install:
 	# Install the app tar file.

helm-charts/upstream/csm-application-mobility-helm/debian/meta_data.yaml

@@ -16,6 +16,7 @@ src_files:
   - csm-application-mobility-helm/files/velero/0002-velero-add-label-app.starlingx.io-component.patch
 revision:
   dist: $STX_DIST
+  stx_patch: 0
   GITREVCOUNT:
     BASE_SRCREV: 8db8f63466df064069133380243443e3822fa8ce
-    SRC_DIR: ${MY_REPO}/stx/app-dell-storage/csm-application-mobility-helm
+    SRC_DIR: ${MY_REPO}/stx/app-dell-storage/helm-charts/upstream/csm-application-mobility-helm

helm-charts/upstream/csm-observability-helm/csm-observability-helm/files/Makefile

@@ -30,12 +30,11 @@ lint-%: init-%
 	if [ -d $* ]; then helm lint $*; fi
 
 build-%: lint-%
-	if [ -d $* ]; then helm package $*; fi
+	if [ -d $* ]; then helm package --version $(CHART_VERSION) $*; fi
 
 clean:
 	@echo "Clean all build artifacts"
 	rm -f */templates/_partials.tpl */templates/_globals.tpl
-	rm -f *tgz */charts/*tgz
 	rm -rf */charts */tmpcharts
 
 %:

helm-charts/upstream/csm-observability-helm/debian/deb_folder/rules

@@ -0,0 +1,26 @@
+#!/usr/bin/make -f
+#export DH_VERBOSE = 1
+
+export DEB_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+export PATCH_VERSION = $(shell echo $(DEB_VERSION) | cut -f 4 -d '.')
+export CHART_BASE_VERSION = $(shell echo $(DEB_VERSION) | sed 's/-/./' | cut -d '.' -f 1-3)
+export CHART_VERSION = $(CHART_BASE_VERSION)+STX.$(PATCH_VERSION)
+
+
+export ROOT = debian/tmp
+export APP_FOLDER = $(ROOT)/usr/lib/helm
+
+%:
+	dh $@
+
+override_dh_auto_build:
+
+	cp Makefile charts
+	cd charts && make CHART_VERSION=$(CHART_VERSION) karavi-observability
+
+override_dh_auto_install:
+	# Install the app tar file.
+	install -d -m 755 $(APP_FOLDER)
+	install -p -D -m 755 charts/karavi-observability*.tgz $(APP_FOLDER)
+
+override_dh_auto_test:

helm-charts/upstream/csm-observability-helm/debian/meta_data.yaml

@@ -9,6 +9,7 @@ src_files:
   - csm-observability-helm/files/Makefile
 revision:
   dist: $STX_DIST
+  stx_patch: 0
   GITREVCOUNT:
     BASE_SRCREV: 8db8f63466df064069133380243443e3822fa8ce
-    SRC_DIR: ${MY_REPO}/stx/app-dell-storage/csm-observability-helm
+    SRC_DIR: ${MY_REPO}/stx/app-dell-storage/helm-charts/upstream/csm-observability-helm

helm-charts/upstream/csm-replication-helm/csm-replication-helm/files/Makefile

@@ -32,12 +32,11 @@ lint-%: init-%
 	rm -v -f $*/requirements.lock $*/requirements.yaml
 
 build-%: lint-%
-	if [ -d $* ]; then helm package $*; fi
+	if [ -d $* ]; then helm package --version $(CHART_VERSION) $*; fi
 
 clean:
 	@echo "Clean all build artifacts"
 	rm -f */templates/_partials.tpl */templates/_globals.tpl
-	rm -f *tgz */charts/*tgz */requirements.lock
 	rm -rf */charts */tmpcharts
 
 %:

helm-charts/upstream/csm-replication-helm/debian/deb_folder/rules

@@ -0,0 +1,25 @@
+#!/usr/bin/make -f
+#export DH_VERBOSE = 1
+
+export DEB_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+export PATCH_VERSION = $(shell echo $(DEB_VERSION) | cut -f 4 -d '.')
+export CHART_BASE_VERSION = $(shell echo $(DEB_VERSION) | sed 's/-/./' | cut -d '.' -f 1-3)
+export CHART_VERSION = $(CHART_BASE_VERSION)+STX.$(PATCH_VERSION)
+
+export ROOT = debian/tmp
+export APP_FOLDER = $(ROOT)/usr/lib/helm
+
+%:
+	dh $@
+
+override_dh_auto_build:
+
+	cp Makefile helm
+	cd helm && make CHART_VERSION=$(CHART_VERSION) csm-replication
+
+override_dh_auto_install:
+	# Install the app tar file.
+	install -d -m 755 $(APP_FOLDER)
+	install -p -D -m 755 helm/csm-replication*.tgz $(APP_FOLDER)
+
+override_dh_auto_test:

helm-charts/upstream/csm-replication-helm/debian/meta_data.yaml

@@ -9,6 +9,7 @@ src_files:
   - csm-replication-helm/files/Makefile
 revision:
   dist: $STX_DIST
+  stx_patch: 0
   GITREVCOUNT:
     BASE_SRCREV: 8db8f63466df064069133380243443e3822fa8ce
-    SRC_DIR: ${MY_REPO}/stx/app-dell-storage/csm-replication-helm
+    SRC_DIR: ${MY_REPO}/stx/app-dell-storage/helm-charts/upstream/csm-replication-helm

stx-dell-storage-helm/debian/deb_folder/changelog

@@ -1,3 +1,9 @@
+stx-dell-storage-helm (1.1-0) unstable; urgency=medium
+
+  * New upstream release.
+
+ --  Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>  Fri, 23 Feb 2024 14:30:00 +0000
+
 stx-dell-storage-helm (1.0-1) unstable; urgency=medium
 
   * Initial release.

stx-dell-storage-helm/debian/deb_folder/copyright

@@ -3,7 +3,7 @@ Upstream-Name: stx-dell-storage-helm
 Source: https://opendev.org/starlingx/app-dell-storage/
 
 Files: *
-Copyright: (c) 2023 Wind River Systems, Inc
+Copyright: (c) 2023-2024 Wind River Systems, Inc
 License: Apache-2
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ License: Apache-2
 # If you want to use GPL v2 or later for the /debian/* files use
 # the following clauses, or change it to suit. Delete these two lines
 Files: debian/*
-Copyright: 2023 Wind River Systems, Inc
+Copyright: 2023-2024 Wind River Systems, Inc
 License: Apache-2
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

stx-dell-storage-helm/debian/deb_folder/rules

@@ -10,7 +10,7 @@ export REVISION = $(shell echo $(DEB_VERSION) | cut -f 4 -d '.')
 
 export APP_NAME = dell-storage
 export APP_VERSION = $(RELEASE)-$(REVISION)
-export APP_TARBALL_FLUXCD = $(APP_NAME)-$(APP_VERSION).tgz
+export APP_TARBALL = $(APP_NAME)-$(APP_VERSION).tgz
 export HELM_FOLDER = /usr/lib/helm
 export HELM_REPO = stx-platform
 export STAGING = staging
@@ -26,6 +26,18 @@ override_dh_auto_build:
 	mkdir -p $(STAGING)/charts
 	cp $(HELM_FOLDER)/*.tgz $(STAGING)/charts
 
+	# Adjust the helmrelease yamls based on the chart versions
+	for c in $(STAGING)/charts/*; do \
+		chart=$$(basename $$c .tgz); \
+		chart_name=$${chart%-*}; \
+		chart_version=$${chart##*-}; \
+		echo "Found $$chart; name: $$chart_name, version: $$chart_version"; \
+		chart_manifest=$$(find $(STAGING)/fluxcd-manifests -name helmrelease.yaml -exec grep -q "chart:.*$$chart_name" {} \; -print); \
+		echo "Updating manifest: $$chart_manifest"; \
+		sed -i "s/REPLACE_HELM_CHART_VERSION/$$chart_version/g" $$chart_manifest; \
+		grep version $$chart_manifest; \
+	done
+
 	# Populate metadata.
 	sed -i 's/APP_REPLACE_NAME/$(APP_NAME)/g' $(STAGING)/metadata.yaml
 	sed -i 's/APP_REPLACE_VERSION/$(APP_VERSION)/g' $(STAGING)/metadata.yaml
@@ -37,7 +49,7 @@ override_dh_auto_build:
 
 	# Create the app package.
 	cd $(STAGING) && find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5
-	tar cfz $(APP_TARBALL_FLUXCD) -C $(STAGING)/ .
+	tar cfz $(APP_TARBALL) -C $(STAGING)/ .
 
 	# Cleanup staging
 	rm -rf $(STAGING)
@@ -45,7 +57,7 @@ override_dh_auto_build:
 override_dh_auto_install:
 	# Install the app tar file.
 	install -d -m 755 $(APP_FOLDER)
-	install -p -D -m 755 $(APP_TARBALL_FLUXCD) $(APP_FOLDER)
+	install -p -D -m 755 $(APP_TARBALL) $(APP_FOLDER)
 
 override_dh_auto_test:
 

stx-dell-storage-helm/debian/meta_data.yaml

@@ -1,6 +1,6 @@
 ---
 debname: stx-dell-storage-helm
-debver: 1.0-1
+debver: 1.1-0
 src_path: stx-dell-storage-helm
 revision:
   dist: $STX_DIST

stx-dell-storage-helm/stx-dell-storage-helm/fluxcd-manifests/csi-powerstore/csi-powerstore-static-overrides.yaml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023 Wind River Systems, Inc.
+# Copyright (c) 2023-2024 Wind River Systems, Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -12,23 +12,24 @@ app.starlingx.io/component: platform
 
 controller:
   metadataretriever:
-    image: docker.io/dellemc/csi-metadata-retriever:v1.4.0
+    image: docker.io/dellemc/csi-metadata-retriever:v1.6.1
   attacher:
-    image: registry.k8s.io/sig-storage/csi-attacher:v4.3.0
+    image: registry.k8s.io/sig-storage/csi-attacher:v4.4.2
   healthMonitor:
-    image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0
+    image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.10.0
   provisioner:
-    image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
+    image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.2
   replication:
-    image: docker.io/dellemc/dell-csi-replicator:v1.5.0
+    image: docker.io/dellemc/dell-csi-replicator:v1.7.1
   resizer:
-    image: registry.k8s.io/sig-storage/csi-resizer:v1.8.0
+    image: registry.k8s.io/sig-storage/csi-resizer:v1.9.2
   vgsnapshot:
-    image: docker.io/dellemc/csi-volumegroup-snapshotter:v1.2.0
+    image: docker.io/dellemc/csi-volumegroup-snapshotter:v1.4.0
   snapshot:
-    image: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2
+    image: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2
     snapNamePrefix: csi-powerstore-snap
   volumeNamePrefix: csi-powerstore-vol
+  nodeSelector: { "node-role.kubernetes.io/control-plane": "" }
   tolerations:
   - key: "node-role.kubernetes.io/master"
     operator: "Exists"
@@ -39,18 +40,17 @@ controller:
 
 node:
   registrar:
-    image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
+    image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1
+  nodeSelector: { "kubernetes.io/os": "linux" }
   tolerations:
   - operator: "Exists"
 
 driver:
-  image: docker.io/dellemc/csi-powerstore:v2.7.0
+  image: docker.io/dellemc/csi-powerstore:v2.9.1
 
 podmon:
-  image: docker.io/dellemc/podmon:v1.6.0
+  image: docker.io/dellemc/podmon:v1.8.1
 
 secret:
-  create: true
-  arrays:
 
 storageClasses:

stx-dell-storage-helm/stx-dell-storage-helm/fluxcd-manifests/csi-powerstore/helmrelease.yaml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023 Wind River Systems, Inc.
+# Copyright (c) 2023-2024 Wind River Systems, Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -15,7 +15,7 @@ spec:
   chart:
     spec:
       chart: csi-powerstore
-      version: 2.7.0
+      version: REPLACE_HELM_CHART_VERSION
       sourceRef:
         kind: HelmRepository
         name: stx-platform

stx-dell-storage-helm/stx-dell-storage-helm/fluxcd-manifests/csi-unity/helmrelease.yaml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023 Wind River Systems, Inc.
+# Copyright (c) 2023-2024 Wind River Systems, Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -15,7 +15,7 @@ spec:
   chart:
     spec:
       chart: csi-unity
-      version: 2.7.0
+      version: REPLACE_HELM_CHART_VERSION
       sourceRef:
         kind: HelmRepository
         name: stx-platform