Browse Source
add fix for GCP CSI driver (#8616)
Signed-off-by: Lubos Mercl <lubos.mercl@gmail.com>
pull/8782/head
Lubos Mercl
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
10 additions and
7 deletions
-
roles/download/defaults/main.yml
-
roles/kubernetes-apps/csi_driver/gcp_pd/defaults/main.yml
-
roles/kubernetes-apps/csi_driver/gcp_pd/templates/gcp-pd-csi-controller.yml.j2
-
roles/kubernetes-apps/csi_driver/gcp_pd/templates/gcp-pd-csi-node.yml.j2
|
|
|
@ -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" |
|
|
|
|
|
|
|
@ -1,3 +1,2 @@ |
|
|
|
--- |
|
|
|
gcp_pd_csi_controller_replicas: 1 |
|
|
|
gcp_pd_csi_driver_image_tag: "v0.7.0-gke.0" |
|
|
|
@ -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" |
|
|
|
|
|
|
|
@ -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" |
|
|
|
|
