Merge pull request #168 from davidz627/fix/strictKustomize

Strict Kustomize Patching

Author: k8s-ci-robot

deploy/kubernetes/base/controller.yaml

@@ -16,7 +16,7 @@ spec:
       serviceAccountName: csi-controller-sa
       containers:
         - name: csi-provisioner
-          image: gcr.io/gke-release/csi-provisioner:v0.4.1-gke.0
+          image: MUSTPATCHWITHKUSTOMIZE
           args:
             - "--v=5"
             - "--provisioner=pd.csi.storage.gke.io"
@@ -25,15 +25,15 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: csi-attacher
-          image: gcr.io/gke-release/csi-attacher:v0.4.1-gke.0
+          image: MUSTPATCHWITHKUSTOMIZE
           args:
             - "--v=5"
             - "--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
+          image: MUSTPATCHWITHKUSTOMIZE
           args:
             - "--v=5"
             - "--endpoint=unix:/csi/csi.sock"

deploy/kubernetes/base/node.yaml

@@ -15,7 +15,7 @@ spec:
       serviceAccountName: csi-node-sa
       containers:
         - name: csi-driver-registrar
-          image: gcr.io/gke-release/csi-driver-registrar:v0.4.1-gke.0
+          image: MUSTPATCHWITHKUSTOMIZE
           args:
             - "--v=5"
             - "--csi-address=/var/lib/kubelet/plugins/pd.csi.storage.gke.io/csi.sock"
@@ -37,7 +37,7 @@ spec:
         - name: gce-pd-driver
           securityContext:
             privileged: true
-          image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.2.0-gke.0
+          image: MUSTPATCHWITHKUSTOMIZE
           args:
             - "--v=5"
             - "--endpoint=unix:/csi/csi.sock"

deploy/kubernetes/overlays/dev/controller_images.yaml

@@ -6,6 +6,10 @@ spec:
   template:
     spec:
       containers:
+        - name: csi-provisioner
+          image: gcr.io/gke-release/csi-provisioner:v0.4.1-gke.0
+        - name: csi-attacher
+          image: gcr.io/gke-release/csi-attacher:v0.4.1-gke.0
         - name: csi-snapshotter
           imagePullPolicy: Always
           image: quay.io/k8scsi/csi-snapshotter:v0.4.0
@@ -21,3 +25,4 @@ spec:
         - name: gce-pd-driver
           imagePullPolicy: Always
           image: gcr.io/dyzz-csi-staging/csi/gce-pd-driver:latest
+

deploy/kubernetes/overlays/dev/node_images.yaml

@@ -9,3 +9,5 @@ spec:
         - name: gce-pd-driver
           imagePullPolicy: Always
           image: gcr.io/dyzz-csi-staging/csi/gce-pd-driver:latest
+        - name: csi-driver-registrar
+          image: gcr.io/gke-release/csi-driver-registrar:v0.4.1-gke.0

deploy/kubernetes/overlays/prow-head-template/controller_images.yaml

@@ -6,5 +6,9 @@ spec:
   template:
     spec:
       containers:
+        - name: csi-provisioner
+          image: gcr.io/gke-release/csi-provisioner:v0.4.1-gke.0
+        - name: csi-attacher
+          image: gcr.io/gke-release/csi-attacher:v0.4.1-gke.0
         - name: gce-pd-driver
-          image: PROW_GCEPD_IMAGE:latest
+          image: PROW_GCEPD_IMAGE:latest

deploy/kubernetes/overlays/prow-head-template/node_images.yaml

@@ -8,3 +8,5 @@ spec:
       containers:
         - name: gce-pd-driver
           image: PROW_GCEPD_IMAGE:latest
+        - name: csi-driver-registrar
+          image: gcr.io/gke-release/csi-driver-registrar:v0.4.1-gke.0

deploy/kubernetes/overlays/stable/controller_images.yaml

@@ -0,0 +1,14 @@
+kind: StatefulSet
+apiVersion: apps/v1
+metadata:
+  name: csi-gce-pd-controller
+spec:
+  template:
+    spec:
+      containers:
+        - name: csi-provisioner
+          image: gcr.io/gke-release/csi-provisioner:v0.4.1-gke.0
+        - name: csi-attacher
+          image: gcr.io/gke-release/csi-attacher:v0.4.1-gke.0
+        - name: gce-pd-driver
+          image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.2.0-gke.0

deploy/kubernetes/overlays/stable/kustomization.yaml

@@ -1,2 +1,5 @@
 bases:
 - ../../base
+patches:
+- controller_images.yaml
+- node_images.yaml

deploy/kubernetes/overlays/stable/node_images.yaml

@@ -0,0 +1,12 @@
+kind: DaemonSet
+apiVersion: apps/v1
+metadata:
+  name: csi-gce-pd-node
+spec:
+  template:
+    spec:
+      containers:
+        - name: csi-driver-registrar
+          image: gcr.io/gke-release/csi-driver-registrar:v0.4.1-gke.0
+        - name: gce-pd-driver
+          image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v0.2.0-gke.0