e2e: simplify gcePD .yaml files

Setting command line arguments via env variables that are not needed by the binaries is just unnecessarily complex. The driver renaming code in the E2E manifest PR would have to be made more complex to deal with such a deployment. It is easier for that code and humans who look at the .yaml file to remove the indirection.

e2e: simplify gcePD .yaml files
dcbcef13 · Patrick Ohly · 1effe0ca · dcbcef13 · dcbcef13
Commit dcbcef13 authored Oct 25, 2018 by Patrick Ohly
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 20 deletions

controller_ss.yaml ...e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml +3 -11

node_ds.yaml test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml +3 -9

No files found.
--- a/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml
+++ b/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml
@@ -20,10 +20,7 @@ spec:
          args:
            - "--v=5"
            - "--provisioner=com.google.csi.gcepd"
-            - "--csi-address=$(ADDRESS)"
+            - "--csi-address=/csi/csi.sock"
-          env:
-            - name: ADDRESS
-              value: /csi/csi.sock
          volumeMounts:
            - name: socket-dir
              mountPath: /csi
@@ -32,10 +29,7 @@ spec:
          image: quay.io/k8scsi/csi-attacher:v0.2.0
          args:
            - "--v=5"
-            - "--csi-address=$(ADDRESS)"
+            - "--csi-address=/csi/csi.sock"
-          env:
-            - name: ADDRESS
-              value: /csi/csi.sock
          volumeMounts:
            - name: socket-dir
              mountPath: /csi
@@ -44,11 +38,9 @@ spec:
          image: gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver:v0.1.0.alpha
          args:
            - "--v=5"
-            - "--endpoint=$(CSI_ENDPOINT)"
+            - "--endpoint=unix:///csi/csi.sock"
            - "--nodeid=$(KUBE_NODE_NAME)"
          env:
-            - name: CSI_ENDPOINT
-              value: unix:///csi/csi.sock
            - name: KUBE_NODE_NAME
              valueFrom:
                fieldRef:

--- a/test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml
+++ b/test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml
@@ -18,13 +18,9 @@ spec:
          image: quay.io/k8scsi/driver-registrar:v0.3.0
          args:
            - "--v=5"
-            - "--csi-address=$(ADDRESS)"
+            - "--csi-address=/csi/csi.sock"
-            - "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)"
+            - "--kubelet-registration-path=/var/lib/kubelet/plugins/com.google.csi.gcepd/csi.sock"
          env:
-            - name: ADDRESS
-              value: /csi/csi.sock
-            - name: DRIVER_REG_SOCK_PATH
-              value: /var/lib/kubelet/plugins/com.google.csi.gcepd/csi.sock
            - name: KUBE_NODE_NAME
              valueFrom:
                fieldRef:
@@ -41,11 +37,9 @@ spec:
          image: gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver:v0.1.0.alpha
          args:
            - "--v=5"
-            - "--endpoint=$(CSI_ENDPOINT)"
+            - "--endpoint=unix:///csi/csi.sock"
            - "--nodeid=$(KUBE_NODE_NAME)"
          env:
-            - name: CSI_ENDPOINT
-              value: unix:///csi/csi.sock
            - name: KUBE_NODE_NAME
              valueFrom:
                fieldRef: