Merge branch 'release-v1.8.0' into velero-update

dell · Aug 28, 2023 · 9b396bf · 9b396bf
2 parents a7a96d3 + c6a5ff8
commit 9b396bf
Show file tree

Hide file tree

Showing 31 changed files with 317 additions and 107 deletions.
diff --git a/.github/workflows/helm-validations.yml b/.github/workflows/helm-validations.yml
@@ -8,7 +8,7 @@ on:
       - main
       - karavi-observability-release
       - csm-authorization-release
-      - release-v1.7.0
+      - release-v*
 
 jobs:
   # This job will check to see if any .yaml file is modified

diff --git a/charts/container-storage-modules/Chart.yaml b/charts/container-storage-modules/Chart.yaml
@@ -40,27 +40,27 @@ appVersion: "1.0.1"
 
 dependencies:
 - name: csi-powerstore
-  version: 2.7.0
+  version: 2.8.0
   repository: https://dell.github.io/helm-charts
   condition: csi-powerstore.enabled
 
 - name: csi-powermax
-  version: 2.7.0
+  version: 2.8.0
   repository: https://dell.github.io/helm-charts
   condition: csi-powermax.enabled
 
 - name: csi-isilon
-  version: 2.7.0
+  version: 2.8.0
   repository: https://dell.github.io/helm-charts
   condition: csi-isilon.enabled
 
 - name: csi-vxflexos
-  version: 2.7.1
+  version: 2.8.0
   repository: https://dell.github.io/helm-charts
   condition: csi-vxflexos.enabled
 
 - name: csi-unity
-  version: 2.7.0
+  version: 2.8.0
   repository: https://dell.github.io/helm-charts
   condition: csi-unity.enabled
 

diff --git a/charts/container-storage-modules/values.yaml b/charts/container-storage-modules/values.yaml
@@ -20,7 +20,7 @@
 ########################
 csi-powerstore:
   enabled: false
-  version: "v2.7.0"
+  version: "v2.8.0"
   images:
     driverRepository: dellemc
   ## Controller ATTRIBUTES
@@ -99,6 +99,8 @@ csi-powerstore:
         - "--driver-config-params=/powerstore-config-params/driver-config-params.yaml"
         - "--driverPodLabelValue=dell-storage"
         - "--ignoreVolumelessPods=false"
+  # maxPowerstoreVolumesPerNode: Specify default value for maximum number of volumes that controller can publish to the node.
+  maxPowerstoreVolumesPerNode: 0
 
 ## CSI PowerMax
 ########################
@@ -117,7 +119,7 @@ csi-powermax:
       - endpoint: https://backup-1.unisphe.re:8443
   #    - endpoint: https://primary-2.unisphe.re:8443
   #    - endpoint: https://backup-2.unisphe.re:8443
-  version: "v2.7.0"
+  version: "v2.8.0"
   images:
     driverRepository: "dellemc"
   clusterPrefix: ABC
@@ -136,7 +138,7 @@ csi-powermax:
       enabled: false
     nodeSelector:
   csireverseproxy:
-    image: dellemc/csipowermax-reverseproxy:v2.6.0
+    image: dellemc/csipowermax-reverseproxy:v2.7.0
     deployAsSidecar: true
   replication:
     enabled: false
@@ -160,7 +162,7 @@ csi-powermax:
 ########################
 csi-isilon:
   enabled: false
-  version: "v2.7.0"
+  version: "v2.8.0"
   images:
     driverRepository: dellemc
   ## Controller ATTRIBUTES
@@ -241,10 +243,10 @@ csi-isilon:
 ########################
 csi-vxflexos:
   enabled: false
-  version: v2.7.1
+  version: v2.8.0
   images:
     driverRepository: dellemc
-    powerflexSdc: dellemc/sdc:3.6.0.6
+    powerflexSdc: dellemc/sdc:3.6.1
   certSecretCount: 0
   controller:
     replication:
@@ -282,11 +284,16 @@ csi-vxflexos:
     # - key: "isilon.podmon.storage.dell.com"
     #   operator: "Exists"
     #   effect: "NoSchedule"
+  storageCapacity:
+    enabled: true  
   monitor:
     enabled: false
   vgsnapshotter:
     enabled: false
     image: dellemc/csi-volumegroup-snapshotter:v1.2.0
+  # maxVxflexosVolumesPerNode - Maximum number of volumes that controller can publish to the node.
+  maxVxflexosVolumesPerNode: 0  
+
   podmon:
     enabled: false
     image: dellemc/podmon:v1.6.0
@@ -317,7 +324,7 @@ csi-vxflexos:
 ########################
 csi-unity:
   enabled: false
-  version: "v2.7.0"
+  version: "v2.8.0"
 
   # certSecretCount: Represents number of certificate secrets, which user is going to create for
   # ssl authentication. (unity-cert-0..unity-cert-n)
@@ -436,6 +443,11 @@ csi-unity:
   # tenantName - Tenant name that need to added while adding host entry to the array.
   tenantName: ""
 
+# Storage Capacity Tracking
+# Note: Capacity tracking is supported in kubernetes v1.24 and above, this feature will be automatically disabled in older versions.
+storageCapacity:
+  enabled: true
+
   images:
     driverRepository: dellemc
 

diff --git a/charts/csi-isilon/Chart.yaml b/charts/csi-isilon/Chart.yaml
@@ -1,11 +1,11 @@
 apiVersion: v2
 name: csi-isilon
-version: 2.7.0
-appVersion: "2.7.0"
-kubeVersion: ">= 1.21.0 < 1.28.0"
+version: 2.8.0
+appVersion: "2.8.0"
+kubeVersion: ">= 1.21.0 < 1.29.0"
 #If you are using a complex K8s version like "v1.22.3-mirantis-1", use this kubeVersion check instead
 #WARNING: this version of the check will allow the use of alpha and beta versions, which is NOT SUPPORTED
-#kubeVersion: ">= 1.21.0-0 < 1.28.0-0"
+#kubeVersion: ">= 1.21.0-0 < 1.29.0-0"
 description: |
   PowerScale CSI (Container Storage Interface) driver Kubernetes
   integration. This chart includes everything required to provision via CSI as

diff --git a/charts/csi-isilon/templates/_helpers.tpl b/charts/csi-isilon/templates/_helpers.tpl
@@ -3,47 +3,47 @@ Return the appropriate sidecar images based on k8s version
 */}}
 {{- define "csi-isilon.attacherImage" -}}
   {{- if eq .Capabilities.KubeVersion.Major "1" }}
-    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
+    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
       {{- print "registry.k8s.io/sig-storage/csi-attacher:v4.3.0" -}}
     {{- end -}}
   {{- end -}}
 {{- end -}}
 
 {{- define "csi-isilon.provisionerImage" -}}
   {{- if eq .Capabilities.KubeVersion.Major "1" }}
-    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
+    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
       {{- print "registry.k8s.io/sig-storage/csi-provisioner:v3.5.0" -}}
     {{- end -}}
   {{- end -}}
 {{- end -}}
 
 {{- define "csi-isilon.snapshotterImage" -}}
   {{- if eq .Capabilities.KubeVersion.Major "1" }}
-    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
+    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
       {{- print "registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2" -}}
     {{- end -}}
   {{- end -}}
 {{- end -}}
 
 {{- define "csi-isilon.resizerImage" -}}
   {{- if eq .Capabilities.KubeVersion.Major "1" }}
-    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
+    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
       {{- print "registry.k8s.io/sig-storage/csi-resizer:v1.8.0" -}}
     {{- end -}}
   {{- end -}}
 {{- end -}}
 
 {{- define "csi-isilon.registrarImage" -}}
   {{- if eq .Capabilities.KubeVersion.Major "1" }}
-    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
+    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
       {{- print "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0" -}}
     {{- end -}}
   {{- end -}}
 {{- end -}}
 
 {{- define "csi-isilon.healthmonitorImage" -}}
   {{- if eq .Capabilities.KubeVersion.Major "1" }}
-    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
+    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
       {{- print "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0" -}}
     {{- end -}}
   {{- end -}}

diff --git a/charts/csi-isilon/values.yaml b/charts/csi-isilon/values.yaml
@@ -2,7 +2,7 @@
 ########################
 # version: version of this values file
 # Note: Do not change this value
-version: "v2.7.0"
+version: "v2.8.0"
 
 # CSI driver log level
 # Allowed values: "error", "warn"/"warning", "info", "debug"

diff --git a/charts/csi-powermax/Chart.yaml b/charts/csi-powermax/Chart.yaml
@@ -1,22 +1,22 @@
 apiVersion: v2
-appVersion: "2.7.0"
+appVersion: "2.8.0"
 name: csi-powermax
-version: 2.7.0
+version: 2.8.0
 description: |
   PowerMax CSI (Container Storage Interface) driver Kubernetes
   integration. This chart includes everything required to provision via CSI as
   well as a PowerMax StorageClass.
 type: application
-kubeVersion: ">= 1.23.0 < 1.28.0"
+kubeVersion: ">= 1.23.0 < 1.29.0"
 # If you are using a complex K8s version like "v1.23.3-mirantis-1", use this kubeVersion check instead
 # WARNING: this version of the check will allow the use of alpha and beta versions, which is NOT SUPPORTED
-# kubeVersion: ">= 1.23.0-0 < 1.28.0-0"
+# kubeVersion: ">= 1.23.0-0 < 1.29.0-0"
 keywords:
 - csi
 - storage
 dependencies:
   - name: csireverseproxy
-    version: 2.6.0
+    version: 2.7.0
     condition: required
 home: https://github.com/dell/csi-powermax
 icon: https://avatars1.githubusercontent.com/u/20958494?s=200&v=4

diff --git a/charts/csi-powermax/charts/csireverseproxy/Chart.yaml b/charts/csi-powermax/charts/csireverseproxy/Chart.yaml
@@ -4,6 +4,6 @@ description: A Helm chart for CSI PowerMax ReverseProxy
 
 type: application
 
-version: 2.6.0
+version: 2.7.0
 
-appVersion: 2.6.0
+appVersion: 2.7.0
diff --git a/charts/csi-powermax/charts/csireverseproxy/values.yaml b/charts/csi-powermax/charts/csireverseproxy/values.yaml
@@ -1,4 +1,4 @@
-image: dellemc/csipowermax-reverseproxy:v2.6.0
+image: dellemc/csipowermax-reverseproxy:v2.7.0
 port: 2222
 
 # TLS secret which is used for setting up the proxy HTTPS server

diff --git a/charts/csi-powermax/templates/_helpers.tpl b/charts/csi-powermax/templates/_helpers.tpl
@@ -3,48 +3,56 @@ Return the appropriate sidecar images based on k8s version
 */}}
 {{- define "csi-powermax.attacherImage" -}}
   {{- if eq .Capabilities.KubeVersion.Major "1" }}
-    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
+    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
       {{- print "registry.k8s.io/sig-storage/csi-attacher:v4.3.0" -}}
     {{- end -}}
   {{- end -}}
 {{- end -}}
 
 {{- define "csi-powermax.provisionerImage" -}}
   {{- if eq .Capabilities.KubeVersion.Major "1" }}
-    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
+    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
       {{- print "registry.k8s.io/sig-storage/csi-provisioner:v3.5.0" -}}
     {{- end -}}
   {{- end -}}
 {{- end -}}
 
 {{- define "csi-powermax.snapshotterImage" -}}
   {{- if eq .Capabilities.KubeVersion.Major "1" }}
-    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
+    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
       {{- print "registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2" -}}
     {{- end -}}
   {{- end -}}
 {{- end -}}
 
 {{- define "csi-powermax.resizerImage" -}}
   {{- if eq .Capabilities.KubeVersion.Major "1" }}
-    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
+    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
       {{- print "registry.k8s.io/sig-storage/csi-resizer:v1.8.0" -}}
     {{- end -}}
   {{- end -}}
 {{- end -}}
 
 {{- define "csi-powermax.registrarImage" -}}
   {{- if eq .Capabilities.KubeVersion.Major "1" }}
-    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
+    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
       {{- print "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0" -}}
     {{- end -}}
   {{- end -}}
 {{- end -}}
 
 {{- define "csi-powermax.healthmonitorImage" -}}
   {{- if eq .Capabilities.KubeVersion.Major "1" }}
-    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
+    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
       {{- print "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0" -}}
     {{- end -}}
   {{- end -}}
 {{- end -}}
+
+{{- define "csi-powermax.isStorageCapacitySupported" -}}
+{{- if eq .Values.storageCapacity.enabled true -}}
+  {{- if and (eq .Capabilities.KubeVersion.Major "1") (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") -}}
+      {{- true -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml
@@ -91,7 +91,19 @@ rules:
   - apiGroups: [""]
     resources: ["configmaps"]
     verbs: ["create", "delete", "get", "list", "watch", "update", "patch"]  
-  {{- end}}  
+  {{- end}} 
+  # Permissions for Storage Capacity
+  {{- if eq (include "csi-powermax.isStorageCapacitySupported" .) "true" }}
+  - apiGroups: ["storage.k8s.io"]
+    resources: ["csistoragecapacities"]
+    verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+  - apiGroups: [""]
+    resources: ["pods"]
+    verbs: ["get"]
+  - apiGroups: ["apps"]
+    resources: ["replicasets"]
+    verbs: ["get"]
+  {{- end }}
 ---
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
@@ -184,9 +196,20 @@ spec:
             - "--leader-election"
             - "--extra-create-metadata"
             - "--feature-gates=Topology=true"
+            - "--enable-capacity={{ (include "csi-powermax.isStorageCapacitySupported" .) | default false }}"
+            - "--capacity-ownerref-level=2"
+            - "--capacity-poll-interval={{ .Values.storageCapacity.pollInterval | default "5m" }}"
           env:
             - name: ADDRESS
               value: /var/run/csi/csi.sock
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
           volumeMounts:
             - name: socket-dir
               mountPath: /var/run/csi
@@ -487,4 +510,4 @@ spec:
           secret:
             secretName: proxy-server-root-certificate
         {{ end }}
-        {{ end }}
+        {{ end }}
diff --git a/charts/csi-powermax/templates/csidriver.yaml b/charts/csi-powermax/templates/csidriver.yaml
@@ -7,5 +7,7 @@ metadata:
     name: csi-powermax
   {{- end }}
 spec:
+    podInfoOnMount: true
     attachRequired: true
-    fsGroupPolicy: {{ .Values.fsGroupPolicy }}
+    storageCapacity: {{ (include "csi-powermax.isStorageCapacitySupported" .) | default false }}
+    fsGroupPolicy: {{ .Values.fsGroupPolicy }}