Merge pull request #154 from msau42/simplify-specs

Remove hardcoded environment variables from spec

Author: k8s-ci-robot

deploy/kubernetes/base/controller.yaml

@@ -13,39 +13,31 @@ spec:
       labels:
         app: gcp-compute-persistent-disk-csi-driver
     spec:
-      serviceAccount: csi-controller-sa
+      serviceAccountName: csi-controller-sa
       containers:
         - name: csi-provisioner
           image: gcr.io/gke-release/csi-provisioner:v0.4.1-gke.0
           args:
             - "--v=5"
             - "--provisioner=com.google.csi.gcepd"
-            - "--csi-address=$(ADDRESS)"
-          env:
-            - name: ADDRESS
-              value: /csi/csi.sock
+            - "--csi-address=/csi/csi.sock"
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
         - name: csi-attacher
           image: gcr.io/gke-release/csi-attacher:v0.4.1-gke.0
           args:
             - "--v=5"
-            - "--csi-address=$(ADDRESS)"
-          env:
-            - name: ADDRESS
-              value: /csi/csi.sock
+            - "--csi-address=/csi/csi.sock"
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
         - name: gce-pd-driver
           image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.2.0-gke.0
           args:
             - "--v=5"
-            - "--endpoint=$(CSI_ENDPOINT)"
+            - "--endpoint=unix:/csi/csi.sock"
           env:
-            - name: CSI_ENDPOINT
-              value: unix:/csi/csi.sock
             - name: GOOGLE_APPLICATION_CREDENTIALS
               value: "/etc/cloud-sa/cloud-sa.json"
           volumeMounts:

deploy/kubernetes/base/node.yaml

@@ -12,21 +12,19 @@ spec:
       labels:
         app: gcp-compute-persistent-disk-csi-driver
     spec:
-      serviceAccount: csi-node-sa
+      serviceAccountName: csi-node-sa
       containers:
         - name: csi-driver-registrar
           image: gcr.io/gke-release/csi-driver-registrar:v0.4.1-gke.0
           args:
             - "--v=5"
-            - "--csi-address=$(ADDRESS)"
+            - "--csi-address=/var/lib/kubelet/plugins/com.google.csi.gcepd/csi.sock"
             - "--kubelet-registration-path=/var/lib/kubelet/plugins/com.google.csi.gcepd/csi.sock"
           lifecycle:
             preStop:
               exec:
                 command: ["/bin/sh", "-c", "rm -rf /registration/com.google.csi.gcepd /registration/com.google.csi.gcepd-reg.sock"]
           env:
-            - name: ADDRESS
-              value: /var/lib/kubelet/plugins/com.google.csi.gcepd/csi.sock
             - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:
@@ -42,10 +40,7 @@ spec:
           image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.2.0-gke.0
           args:
             - "--v=5"
-            - "--endpoint=$(CSI_ENDPOINT)"
-          env:
-            - name: CSI_ENDPOINT
-              value: unix:/csi/csi.sock
+            - "--endpoint=unix:/csi/csi.sock"
           volumeMounts:
             - name: kubelet-dir
               mountPath: /var/lib/kubelet