C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add fix for GCP CSI driver (#8616)

Browse source 
Signed-off-by: Lubos Mercl <lubos.mercl@gmail.com>
This commit is contained in:
Lubos Mercl 2022-05-03 17:55:56 +02:00 committed by GitHub
parent fe66121287
commit c20ab7d987
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
roles/download/defaults/main.yml
View file

@ -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_repo: "{{ docker_image_repo }}/amazon/aws-ebs-csi-driver"
aws_ebs_csi_plugin_image_tag: "v0.5.0" 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_image_repo: "mcr.microsoft.com/oss/kubernetes-csi"
azure_csi_provisioner_image_tag: "v2.2.2" azure_csi_provisioner_image_tag: "v2.2.2"
azure_csi_attacher_image_tag: "v3.3.0" azure_csi_attacher_image_tag: "v3.3.0"

1
roles/kubernetes-apps/csi_driver/gcp_pd/defaults/main.yml
View file

@ -1,3 +1,2 @@
--- ---
gcp_pd_csi_controller_replicas: 1 gcp_pd_csi_controller_replicas: 1
gcp_pd_csi_driver_image_tag: "v0.7.0-gke.0"

9
roles/kubernetes-apps/csi_driver/gcp_pd/templates/gcp-pd-csi-controller.yml.j2
View file

@ -23,18 +23,19 @@ spec:
priorityClassName: csi-gce-pd-controller priorityClassName: csi-gce-pd-controller
containers: containers:
- name: csi-provisioner - 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: args:
- "--v=5" - "--v=5"
- "--csi-address=/csi/csi.sock" - "--csi-address=/csi/csi.sock"
- "--feature-gates=Topology=true" - "--feature-gates=Topology=true"
- "--default-fstype=ext4"
# - "--run-controller-service=false" # disable the controller service of the CSI driver # - "--run-controller-service=false" # disable the controller service of the CSI driver
# - "--run-node-service=false" # disable the node service of the CSI driver # - "--run-node-service=false" # disable the node service of the CSI driver
volumeMounts: volumeMounts:
- name: socket-dir - name: socket-dir
mountPath: /csi mountPath: /csi
- name: csi-attacher - 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: args:
- "--v=5" - "--v=5"
- "--csi-address=/csi/csi.sock" - "--csi-address=/csi/csi.sock"
@ -42,7 +43,7 @@ spec:
- name: socket-dir - name: socket-dir
mountPath: /csi mountPath: /csi
- name: csi-resizer - 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: args:
- "--v=5" - "--v=5"
- "--csi-address=/csi/csi.sock" - "--csi-address=/csi/csi.sock"
@ -52,7 +53,7 @@ spec:
- name: gce-pd-driver - name: gce-pd-driver
# Don't change base image without changing pdImagePlaceholder in # Don't change base image without changing pdImagePlaceholder in
# test/k8s-integration/main.go # 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: args:
- "--v=5" - "--v=5"
- "--endpoint=unix:/csi/csi.sock" - "--endpoint=unix:/csi/csi.sock"

4
roles/kubernetes-apps/csi_driver/gcp_pd/templates/gcp-pd-csi-node.yml.j2
View file

@ -21,7 +21,7 @@ spec:
serviceAccountName: csi-gce-pd-node-sa serviceAccountName: csi-gce-pd-node-sa
containers: containers:
- name: csi-driver-registrar - 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: args:
- "--v=5" - "--v=5"
- "--csi-address=/csi/csi.sock" - "--csi-address=/csi/csi.sock"
@ -45,7 +45,7 @@ spec:
privileged: true privileged: true
# Don't change base image without changing pdImagePlaceholder in # Don't change base image without changing pdImagePlaceholder in
# test/k8s-integration/main.go # 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: args:
- "--v=5" - "--v=5"
- "--endpoint=unix:/csi/csi.sock" - "--endpoint=unix:/csi/csi.sock"