Merge pull request #989 from mattcary/overlay-124

Update deployment for 1.24 and 1.25

Author: k8s-ci-robot

deploy/kubernetes/base/controller/kustomization.yaml

@@ -5,5 +5,4 @@ namespace:
 resources:
 - cluster_setup.yaml
 - controller.yaml
-- psp.yaml
 - v1_csidriver.yaml

deploy/kubernetes/base/node_linux/kustomization.yaml

@@ -4,4 +4,3 @@ namespace:
   gce-pd-csi-driver
 resources:
 - node.yaml
-- psp.yaml

deploy/kubernetes/base/node_windows/kustomization.yaml

@@ -4,4 +4,3 @@ namespace:
   gce-pd-csi-driver
 resources:
 - node.yaml
-- psp.yaml

deploy/kubernetes/deploy-driver.sh

@@ -10,8 +10,8 @@
 # Args:
 # GCE_PD_SA_DIR: Directory the service account key has been saved in (generated
 #   by setup-project.sh). Ignored if GCE_PD_DRIVER_VERSION == noauth.
-# GCE_PD_DRIVER_VERSION: The kustomize overlay (located in
-#   deploy/kubernetes/overlays) to deploy. Can be one of {stable, dev}
+# GCE_PD_DRIVER_VERSION: The kustomize overlay to deploy. See
+# `deploy/kubernetes/overlays` for your choices.
 
 set -o nounset
 set -o errexit

deploy/kubernetes/images/stable-1-24/image.yaml

@@ -0,0 +1,56 @@
+apiVersion: builtin
+kind: ImageTagTransformer
+metadata:
+  name: imagetag-csi-provisioner
+imageTag:
+  name: k8s.gcr.io/sig-storage/csi-provisioner
+  newTag: "v3.1.0"
+
+---
+apiVersion: builtin
+kind: ImageTagTransformer
+metadata:
+  name: imagetag-csi-attacher
+imageTag:
+  name: k8s.gcr.io/sig-storage/csi-attacher
+  newTag: "v3.4.0"
+---
+
+apiVersion: builtin
+kind: ImageTagTransformer
+metadata:
+  name: imagetag-csi-resizer
+imageTag:
+  name: k8s.gcr.io/sig-storage/csi-resizer
+  newTag: "v1.4.0"
+---
+
+apiVersion: builtin
+kind: ImageTagTransformer
+metadata:
+  name: imagetag-csi-snapshotter
+imageTag:
+  name: k8s.gcr.io/sig-storage/csi-snapshotter
+  newTag: "v4.0.1"
+---
+
+apiVersion: builtin
+kind: ImageTagTransformer
+metadata:
+  name: imagetag-csi-node-registrar
+imageTag:
+  name: k8s.gcr.io/sig-storage/csi-node-driver-registrar
+  newTag: "v2.5.0"
+---
+
+apiVersion: builtin
+kind: ImageTagTransformer
+metadata:
+  name: imagetag-gcepd-driver
+imageTag:
+  name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
+  # Don't change stable image without changing pdImagePlaceholder in
+  # test/k8s-integration/main.go
+  newName: k8s.gcr.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver
+  newTag: "v1.4.0"
+---

deploy/kubernetes/images/stable-1-24/kustomization.yaml

@@ -0,0 +1,4 @@
+namespace:
+  gce-pd-csi-driver
+resources:
+- image.yaml

deploy/kubernetes/overlays/stable-1-21/kustomization.yaml

@@ -4,5 +4,8 @@ namespace:
   gce-pd-csi-driver
 resources:
 - ../../base/
+- psp_controller.yaml
+- psp_linux.yaml
+- psp_windows.yaml
 transformers:
 - ../../images/stable-1-21