Addressed review comments. Removed unused env var. Added comments. Ad…

…d new line at eof
Huawei · anvithks · Aug 22, 2021 · Aug 22, 2021 · Aug 23, 2021 · Aug 23, 2021
commit 339eb07cb1f1b226b3c5d903b17feead22526163
diff --git a/helm/esdk/templates/huawei-csi-controller.yaml b/helm/esdk/templates/huawei-csi-controller.yaml
@@ -114,4 +114,5 @@ spec:
             name: huawei-csi-configmap
         - name: secret
           secret:
-            secretName: huawei-csi-secret
+            secretName: huawei-csi-secret
+
diff --git a/helm/esdk/templates/huawei-csi-node.yaml b/helm/esdk/templates/huawei-csi-node.yaml
@@ -53,14 +53,14 @@ spec:
           args:
             - "--csi-address=/csi/csi.sock"
             - "--kubelet-registration-path=/var/lib/kubelet/plugins/csi.huawei.com/csi.sock"
-          imagePullPolicy: "IfNotPresent"
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           volumeMounts:
             - name: plugin-dir
               mountPath: /csi
             - name: registration-dir
               mountPath: /registration
         - name: huawei-csi-driver
-          image: {{ required "Must provide the CSI controller service node image." .Values.images.huaweiCsiNodeService }}
+          image: {{ required "Must provide the CSI node service node image." .Values.images.huaweiCsiNodeService }}
           args:
             - "--endpoint=/csi/csi.sock"
             - "--containerized"
@@ -71,17 +71,12 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          imagePullPolicy: "IfNotPresent"
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           lifecycle:
             preStop:
               exec:
                 command: ["/bin/sh", "-c", "rm -f /csi/csi.sock"]
           env:
-            - name: CSI_ESDK_NODENAME
-              valueFrom:
-                fieldRef:
-                  apiVersion: v1
-                  fieldPath: spec.nodeName
           volumeMounts:
             - name: plugin-dir
               mountPath: /csi
@@ -134,4 +129,5 @@ spec:
             name: huawei-csi-configmap
         - name: secret
           secret:
-            secretName: huawei-csi-secret
+            secretName: huawei-csi-secret
+
diff --git a/helm/esdk/values.yaml b/helm/esdk/values.yaml
@@ -1,3 +1,4 @@
+# An array of storages with the access info
 backends:
   - storage: "fusionstorage-san"
     name: "test-esdk-deployment"
@@ -10,10 +11,15 @@ backends:
       portals: 
         - "1.2.3.4"
 images:
+  # The image name and tag for the attacher, provisioner and registrar sidecars. These must match the appropriate Kubernetes version.
   sidecar:
     attacher: quay.io/k8scsi/csi-attacher:v1.2.1
     provisioner: quay.io/k8scsi/csi-provisioner:v1.6.0
     registrar: quay.io/k8scsi/csi-node-driver-registrar:v2.0.1
+  # The image name and tag for the Huawei CSI controller service container
   huaweiCsiControllerService: huawei-csi:test
+  # The image name and tag for the Huawei CSI node service container
   huaweiCsiNodeService: huawei-csi:test
+# Default image pull policy for container images
 imagePullPolicy: "IfNotPresent"
+