Upgrade kustomize and use the set image command to patch the image name and version

Author: msau42

deploy/kubernetes/base/controller.yaml

@@ -16,23 +16,23 @@ spec:
       serviceAccountName: csi-controller-sa
       containers:
         - name: csi-provisioner
-          image: MUSTPATCHWITHKUSTOMIZE
+          image: REPLACEME/csi-provisioner
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
         - name: csi-attacher
-          image: MUSTPATCHWITHKUSTOMIZE
+          image: REPLACEME/csi-attacher
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
         - name: gce-pd-driver
-          image: MUSTPATCHWITHKUSTOMIZE
+          image: REPLACEME/gcp-compute-persistent-disk-csi-driver
           args:
             - "--v=5"
             - "--endpoint=unix:/csi/csi.sock"
@@ -51,3 +51,4 @@ spec:
         - name: cloud-sa-volume
           secret:
             secretName: cloud-sa
+  volumeClaimTemplates: []

deploy/kubernetes/base/node.yaml

@@ -15,7 +15,7 @@ spec:
       serviceAccountName: csi-node-sa
       containers:
         - name: csi-driver-registrar
-          image: MUSTPATCHWITHKUSTOMIZE
+          image: REPLACEME/csi-node-driver-registrar
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
@@ -37,7 +37,7 @@ spec:
         - name: gce-pd-driver
           securityContext:
             privileged: true
-          image: MUSTPATCHWITHKUSTOMIZE
+          image: REPLACEME/gcp-compute-persistent-disk-csi-driver
           args:
             - "--v=5"
             - "--endpoint=unix:/csi/csi.sock"

deploy/kubernetes/install-kustomize.sh

@@ -17,7 +17,7 @@ if [ ! -f "${KUSTOMIZE_PATH}" ]; then
 
   echo "Installing kustomize in ${KUSTOMIZE_PATH}"
   opsys=linux  # or darwin, or windows
-  curl -s https://api.github.com/repos/kubernetes-sigs/kustomize/releases/tags/v1.0.8 |\
+  curl -s https://api.github.com/repos/kubernetes-sigs/kustomize/releases/tags/v2.0.3 |\
     grep browser_download |\
     grep $opsys |\
     cut -d '"' -f 4 |\

deploy/kubernetes/overlays/dev/controller_add_snapshotter.yaml

@@ -0,0 +1,17 @@
+kind: StatefulSet
+apiVersion: apps/v1
+metadata:
+  name: csi-gce-pd-controller
+spec:
+  template:
+    spec:
+      containers:
+        - name: csi-snapshotter
+          imagePullPolicy: Always
+          image: quay.io/k8scsi/csi-snapshotter:v1.0.1
+          args:
+            - "--v=5"
+            - "--csi-address=/csi/csi.sock"
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /csi

deploy/kubernetes/overlays/dev/controller_always_pull.yaml

@@ -0,0 +1,11 @@
+kind: StatefulSet
+apiVersion: apps/v1
+metadata:
+  name: csi-gce-pd-controller
+spec:
+  template:
+    spec:
+      containers:
+        - name: gce-pd-driver
+          imagePullPolicy: Always
+

deploy/kubernetes/overlays/dev/controller_images.yaml

@@ -1,5 +1,22 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 bases:
 - ../../base
 patches:
-- controller_images.yaml
-- node_images.yaml
+- controller_add_snapshotter.yaml
+- controller_always_pull.yaml
+- node_always_pull.yaml
+images:
+- name: REPLACEME/gcp-compute-persistent-disk-csi-driver
+  # Replace this with your private image name
+  newName: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver
+  newTag: "v0.4.0-gke.0"
+- name: REPLACEME/csi-provisioner
+  newName: quay.io/k8scsi/csi-provisioner
+  newTag: "v1.0.1"
+- name: REPLACEME/csi-attacher
+  newName: quay.io/k8scsi/csi-attacher
+  newTag: "v1.0.1"
+- name: REPLACEME/csi-node-driver-registrar
+  newName: quay.io/k8scsi/csi-node-driver-registrar
+  newTag: "v1.0.1"

deploy/kubernetes/overlays/dev/kustomization.yaml

@@ -8,6 +8,4 @@ spec:
       containers:
         - 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-node-driver-registrar:v1.0.1-gke.0
+

deploy/kubernetes/overlays/dev/node_images.yaml renamed to deploy/kubernetes/overlays/dev/node_always_pull.yaml

@@ -1,5 +1,17 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 bases:
 - ../../base
-patches:
-- controller_images.yaml
-- node_images.yaml
+images:
+- name: REPLACEME/gcp-compute-persistent-disk-csi-driver
+  newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver
+  newTag: "latest"
+- name: REPLACEME/csi-provisioner
+  newName: gcr.io/gke-release-staging/csi-provisioner
+  newTag: "latest"
+- name: REPLACEME/csi-attacher
+  newName: gcr.io/gke-release-staging/csi-attacher
+  newTag: "latest"
+- name: REPLACEME/csi-node-driver-registrar
+  newName: gcr.io/gke-release-staging/csi-node-driver-registrar
+  newTag: "latest"