From c20ab7d9879f2d9b6db3d2d03401e237ca5975fc Mon Sep 17 00:00:00 2001
From: Lubos Mercl <lubos.mercl@gmail.com>
Date: Tue, 3 May 2022 17:55:56 +0200
Subject: [PATCH] add fix for GCP CSI driver (#8616)

Signed-off-by: Lubos Mercl <lubos.mercl@gmail.com>
---
 roles/download/defaults/main.yml                         | 3 +++
 .../kubernetes-apps/csi_driver/gcp_pd/defaults/main.yml  | 1 -
 .../gcp_pd/templates/gcp-pd-csi-controller.yml.j2        | 9 +++++----
 .../csi_driver/gcp_pd/templates/gcp-pd-csi-node.yml.j2   | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 3ad5425ee..c2af0549c 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -987,6 +987,9 @@ cinder_csi_plugin_image_tag: "v1.22.0"
 aws_ebs_csi_plugin_image_repo: "{{ docker_image_repo }}/amazon/aws-ebs-csi-driver"
 aws_ebs_csi_plugin_image_tag: "v0.5.0"
 
+gcp_pd_csi_plugin_image_repo: "{{ kube_image_repo }}/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver"
+gcp_pd_csi_plugin_image_tag: "v1.4.0"
+
 azure_csi_image_repo: "mcr.microsoft.com/oss/kubernetes-csi"
 azure_csi_provisioner_image_tag: "v2.2.2"
 azure_csi_attacher_image_tag: "v3.3.0"
diff --git a/roles/kubernetes-apps/csi_driver/gcp_pd/defaults/main.yml b/roles/kubernetes-apps/csi_driver/gcp_pd/defaults/main.yml
index a6a447e55..1ee662ea3 100644
--- a/roles/kubernetes-apps/csi_driver/gcp_pd/defaults/main.yml
+++ b/roles/kubernetes-apps/csi_driver/gcp_pd/defaults/main.yml
@@ -1,3 +1,2 @@
 ---
 gcp_pd_csi_controller_replicas: 1
-gcp_pd_csi_driver_image_tag: "v0.7.0-gke.0"
diff --git a/roles/kubernetes-apps/csi_driver/gcp_pd/templates/gcp-pd-csi-controller.yml.j2 b/roles/kubernetes-apps/csi_driver/gcp_pd/templates/gcp-pd-csi-controller.yml.j2
index c63322c07..4762093dc 100644
--- a/roles/kubernetes-apps/csi_driver/gcp_pd/templates/gcp-pd-csi-controller.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/gcp_pd/templates/gcp-pd-csi-controller.yml.j2
@@ -23,18 +23,19 @@ spec:
       priorityClassName: csi-gce-pd-controller
       containers:
         - name: csi-provisioner
-          image: {{ gcp_pd_csi_image_repo }}/csi-provisioner:{{ gcp_pd_csi_provisioner_image_tag }}
+          image: {{ csi_provisioner_image_repo }}:{{ csi_provisioner_image_tag }}
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
             - "--feature-gates=Topology=true"
+            - "--default-fstype=ext4"
           # - "--run-controller-service=false" # disable the controller service of the CSI driver
           # - "--run-node-service=false"       # disable the node service of the CSI driver
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
         - name: csi-attacher
-          image: {{ gcp_pd_csi_image_repo }}/csi-attacher:{{ gcp_pd_csi_attacher_image_tag }}
+          image: {{ csi_attacher_image_repo }}:{{ csi_attacher_image_tag }}
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
@@ -42,7 +43,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: csi-resizer
-          image: {{ gcp_pd_csi_image_repo }}/csi-resizer:{{ gcp_pd_csi_resizer_image_tag }}
+          image: {{ csi_resizer_image_repo }}:{{ csi_resizer_image_tag }}
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
@@ -52,7 +53,7 @@ spec:
         - name: gce-pd-driver
           # Don't change base image without changing pdImagePlaceholder in
           # test/k8s-integration/main.go
-          image: {{ gcp_pd_csi_image_repo }}/gcp-compute-persistent-disk-csi-driver:{{ gcp_pd_csi_driver_image_tag }}
+          image: {{ gcp_pd_csi_plugin_image_repo }}:{{ gcp_pd_csi_plugin_image_tag }}
           args:
             - "--v=5"
             - "--endpoint=unix:/csi/csi.sock"
diff --git a/roles/kubernetes-apps/csi_driver/gcp_pd/templates/gcp-pd-csi-node.yml.j2 b/roles/kubernetes-apps/csi_driver/gcp_pd/templates/gcp-pd-csi-node.yml.j2
index 82c1f6bc2..204ff972e 100644
--- a/roles/kubernetes-apps/csi_driver/gcp_pd/templates/gcp-pd-csi-node.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/gcp_pd/templates/gcp-pd-csi-node.yml.j2
@@ -21,7 +21,7 @@ spec:
       serviceAccountName: csi-gce-pd-node-sa
       containers:
         - name: csi-driver-registrar
-          image: {{ gcp_pd_csi_image_repo }}/csi-node-driver-registrar:{{ gcp_pd_csi_registrar_image_tag }}
+          image: {{ csi_node_driver_registrar_image_repo }}:{{ csi_node_driver_registrar_image_tag }}
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
@@ -45,7 +45,7 @@ spec:
             privileged: true
           # Don't change base image without changing pdImagePlaceholder in
           # test/k8s-integration/main.go
-          image: {{ gcp_pd_csi_image_repo }}/gcp-compute-persistent-disk-csi-driver:{{ gcp_pd_csi_driver_image_tag }}
+          image: {{ gcp_pd_csi_plugin_image_repo }}:{{ gcp_pd_csi_plugin_image_tag }}
           args:
             - "--v=5"
             - "--endpoint=unix:/csi/csi.sock"