WIP / [charts/csi-isilon] Centralize all images to one place

charts/csi-isilon/templates/_helpers.tpl

@@ -1,54 +1,3 @@
-{{/*
-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) "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) "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) "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) "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) "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) "28") -}}
-      {{- print "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0" -}}
-    {{- end -}}
-  {{- end -}}
-{{- end -}}
-
 {{/*
 Return true if storage capacity tracking is enabled and is supported based on k8s version
 */}}

charts/csi-isilon/templates/controller.yaml

@@ -194,7 +194,7 @@ spec:
         {{- if hasKey .Values "podmon" }}
         {{- if eq .Values.podmon.enabled true }}
         - name: podmon
-          image: {{ required "Must provide the podmon container image." .Values.podmon.image }}
+          image: {{ required "Must provide the podmon container image." .Values.images.podmon }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             {{- toYaml .Values.podmon.controller.args | nindent 12 }}
@@ -221,7 +221,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.controller.replication.image}}
+          image: {{ required "Must provide the Dell CSI Replicator image." .Values.images.replication }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--csi-address={{ $driverSockPath }}"
@@ -248,7 +248,7 @@ spec:
         {{- if hasKey .Values.controller "resizer" }}
         {{- if eq .Values.controller.resizer.enabled true }}
         - name: resizer{{ $csiSidecarSuffix }}
-          image: {{ required "Must provide the CSI resizer container image." ( include "csi-isilon.resizerImage" . ) }}
+          image: {{ required "Must provide the CSI resizer container image." .Values.images.resizer }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--csi-address={{ $driverSockPath }}"
@@ -272,7 +272,7 @@ spec:
         {{ end }}
         {{ end }}
         - name: csi-metadata-retriever {{ $csiSidecarSuffix }}
-          image: {{ required "Must provide the CSI metadata retriever container image." .Values.controller.metadataretriever.image }}
+          image: {{ required "Must provide the CSI metadata retriever container image." .Values.images.metadataretriever }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--csi-address={{ $driverSockPath }}"
@@ -298,7 +298,7 @@ spec:
             - name: socket-dir
               mountPath: /var/run/csi
         - name: attacher{{ $csiSidecarSuffix }}
-          image: {{ required "Must provide the CSI attacher container image." ( include "csi-isilon.attacherImage" . ) }}
+          image: {{ required "Must provide the CSI attacher container image." .Values.images.attacher }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--csi-address={{ $driverSockPath }}"
@@ -323,7 +323,7 @@ spec:
         {{- if hasKey .Values.controller "healthMonitor" }}
         {{- if eq .Values.controller.healthMonitor.enabled true }}
         - name: external-health-monitor-controller
-          image: {{ required "Must provide the CSI external-health-monitor-controller container image." ( include "csi-isilon.healthmonitorImage" . ) }}
+          image: {{ required "Must provide the CSI external-health-monitor-controller container image." .Values.images.healthmonitor }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--csi-address={{ $driverSockPath }}"
@@ -351,7 +351,7 @@ spec:
         {{end}}
         {{- end }}
         - name: provisioner{{ $csiSidecarSuffix }}
-          image: {{ required "Must provide the CSI provisioner container image." ( include "csi-isilon.provisionerImage" . ) }}
+          image: {{ required "Must provide the CSI provisioner container image." .Values.images.provisioner }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--csi-address={{ $driverSockPath }}"
@@ -393,7 +393,7 @@ spec:
         {{- if eq .Values.controller.snapshot.enabled true }}
         - name: snapshotter{{ $csiSidecarSuffix }}
           #image: quay.io/k8scsi/csi-snapshotter:v1.0.0
-          image: {{ required "Must provide the CSI snapshotter container image." ( include "csi-isilon.snapshotterImage" . ) }}
+          image: {{ required "Must provide the CSI snapshotter container image." .Values.images.snapshotter }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--csi-address={{ $driverSockPath }}"
@@ -419,7 +419,7 @@ spec:
         {{end}}
         {{- if not $encrypted }}
         - name: driver
-          image: {{ required "Must provide the Isilon driver image repository." .Values.images.driverRepository }}/{{ .Chart.Name }}:{{ .Values.version }}
+          image: {{ required "Must provide the Isilon driver image repository." .Values.images.driver }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           command: [ "/csi-isilon" ]
           args:
@@ -519,7 +519,7 @@ spec:
         {{- if eq .Values.authorization.enabled true }}
         - name: karavi-authorization-proxy
           imagePullPolicy: {{ .Values.imagePullPolicy }}
-          image: {{ required "Must provide the authorization sidecar container image." .Values.authorization.sidecarProxyImage }}
+          image: {{ required "Must provide the authorization sidecar container image." .Values.images.authorization }}
           env:
             - name: PROXY_HOST
               value: "{{ .Values.authorization.proxyHost }}"
@@ -549,7 +549,7 @@ spec:
         {{- end }}
         {{- if $encrypted }}
         - name: driver-sec
-          image: {{ .Values.encryption.image }}
+          image: {{ .Values.images.encryption }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - --name={{ .Values.encryption.pluginName }}

charts/csi-isilon/templates/node.yaml

@@ -113,7 +113,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          image: {{ required "Must provide the podmon container image." .Values.podmon.image }}
+          image: {{ required "Must provide the podmon container image." .Values.images.podmon }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             {{- toYaml .Values.podmon.node.args | nindent 12 }}
@@ -167,7 +167,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          image: {{ required "Must provide the Isilon driver image repository." .Values.images.driverRepository }}/{{ .Chart.Name }}:{{ .Values.version }}
+          image: {{ required "Must provide the Isilon driver image repository." .Values.images.driver }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: CSI_ENDPOINT
@@ -251,7 +251,7 @@ spec:
               mountPath: /csi-isilon-config-params
         {{- end }}
         - name: registrar{{ $csiSidecarSuffix }}
-          image: {{ required "Must provide the CSI node registrar container image." ( include "csi-isilon.registrarImage" . ) }}
+          image: {{ required "Must provide the CSI node registrar container image." .Values.images.registrar }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--v=5"
@@ -273,7 +273,7 @@ spec:
         {{- if eq .Values.authorization.enabled true }}
         - name: karavi-authorization-proxy
           imagePullPolicy: {{ .Values.imagePullPolicy }}
-          image: {{ required "Must provide the authorization sidecar container image." .Values.authorization.sidecarProxyImage }}
+          image: {{ required "Must provide the authorization sidecar container image." .Values.images.authorization }}
           env:
             - name: PROXY_HOST
               value: "{{ .Values.authorization.proxyHost }}"
@@ -303,7 +303,7 @@ spec:
         {{- end }}
         {{- if $encrypted }}
         - name: driver-sec
-          image: {{ .Values.encryption.image }}
+          image: {{ .Values.images.encryption }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           securityContext:
             privileged: true

charts/csi-isilon/values.yaml

@@ -4,6 +4,24 @@
 # Note: Do not change this value
 version: "v2.8.0"
 
+images:
+  # "driver" defines the container image, used for the driver container.
+  driver: dellemc/csi-isilon:v2.8.0
+  # CSI sidecars
+  attacher: registry.k8s.io/sig-storage/csi-attacher:v4.3.0
+  provisioner: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
+  snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2
+  resizer: registry.k8s.io/sig-storage/csi-resizer:v1.8.0
+  registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
+  healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0
+
+  # CSM sidecars
+  replication: dellemc/dell-csi-replicator:v1.6.0
+  podmon: dellemc/podmon:v1.7.0
+  authorization: dellemc/csm-authorization-sidecar:v1.8.0
+  metadataretriever: dellemc/csi-metadata-retriever:v1.4.0
+  encryption: dellemc/csm-encryption:v0.3.0
+
 # CSI driver log level
 # Allowed values: "error", "warn"/"warning", "info", "debug"
 # Default value: "debug"
@@ -110,10 +128,6 @@ controller:
     # Default value: 5s
     leaderElectionRetryPeriod: 5s
 
-  # Image for csi-metadata-retriever
-  metadataretriever:
-    image: dellemc/csi-metadata-retriever:v1.4.0
-
   # replication: allows to configure replication
   # Replication CRDs must be installed before installing driver
   replication:
@@ -124,11 +138,6 @@ controller:
     # Default value: false
     enabled: false
 
-    # image: Image to use for dell-csi-replicator. This shouldn't be changed
-    # Allowed values: string
-    # Default value: None
-    image: dellemc/dell-csi-replicator:v1.6.0
-
     # replicationContextPrefix: prefix to use for naming of resources created by replication feature
     # Allowed values: string
     # Default value: powerscale
@@ -359,9 +368,6 @@ autoProbe: true
 
 authorization:
   enabled: false
-  # sidecarProxyImage: the container image used for the csm-authorization-sidecar.
-  # Default value: dellemc/csm-authorization-sidecar:v1.8.0
-  sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.8.0
   # proxyHost: hostname of the csm-authorization server
   # Default value: None
   proxyHost:
@@ -389,30 +395,29 @@ storageCapacity:
 # Enable this feature only after contact support for additional information
 podmon:
   enabled: false
-  image: dellemc/podmon:v1.7.0
-  #controller:
-  #  args:
-  #    - "--csisock=unix:/var/run/csi/csi.sock"
-  #    - "--labelvalue=csi-isilon"
-  #    - "--arrayConnectivityPollRate=60"
-  #    - "--driverPath=csi-isilon.dellemc.com"
-  #    - "--mode=controller"
-  #    - "--skipArrayConnectionValidation=false"
-  #    - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml"
-  #    - "--driverPodLabelValue=dell-storage"
-  #    - "--ignoreVolumelessPods=false"
-
-  #node:
-  #  args:
-  #    - "--csisock=unix:/var/lib/kubelet/plugins/csi-isilon/csi_sock"
-  #    - "--labelvalue=csi-isilon"
-  #    - "--arrayConnectivityPollRate=60"
-  #    - "--driverPath=csi-isilon.dellemc.com"
-  #    - "--mode=node"
-  #    - "--leaderelection=false"
-  #    - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml"
-  #    - "--driverPodLabelValue=dell-storage"
-  #    - "--ignoreVolumelessPods=false"
+  controller:
+   args:
+     - "--csisock=unix:/var/run/csi/csi.sock"
+     - "--labelvalue=csi-isilon"
+     - "--arrayConnectivityPollRate=60"
+     - "--driverPath=csi-isilon.dellemc.com"
+     - "--mode=controller"
+     - "--skipArrayConnectionValidation=false"
+     - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml"
+     - "--driverPodLabelValue=dell-storage"
+     - "--ignoreVolumelessPods=false"
+
+  node:
+   args:
+     - "--csisock=unix:/var/lib/kubelet/plugins/csi-isilon/csi_sock"
+     - "--labelvalue=csi-isilon"
+     - "--arrayConnectivityPollRate=60"
+     - "--driverPath=csi-isilon.dellemc.com"
+     - "--mode=node"
+     - "--leaderelection=false"
+     - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml"
+     - "--driverPodLabelValue=dell-storage"
+     - "--ignoreVolumelessPods=false"
 
 encryption:
   # enabled: Enable/disable volume encryption feature.
@@ -421,9 +426,6 @@ encryption:
   # pluginName: The name of the provisioner to use for encrypted volumes.
   pluginName: "sec-isilon.dellemc.com"
 
-  # image: Encryption driver image name.
-  image: "dellemc/csm-encryption:v0.3.0"
-
   # apiPort: TCP port number used by the REST API server.
   apiPort: 3838
 
@@ -450,6 +452,3 @@ encryption:
   # See the gocryptfs documentation for more details.
   extraArgs: []
 
-images:
-  # "driver" defines the container image, used for the driver container.
-  driverRepository: dellemc