From 619938da954918a124f4847cf2907930dfad767a Mon Sep 17 00:00:00 2001
From: Alexander <payback159@gmail.com>
Date: Wed, 26 Jun 2024 11:40:20 +0200
Subject: [PATCH] =?UTF-8?q?add=20the=20ability=20to=20configure=20extra=20?=
=?UTF-8?q?args=20to=20the=20different=20cinder-csi-p=E2=80=A6=20(#11169)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* add the ability to configure extra args to the different cinder-csi-plugin containers
* endfor block added to be syntactically correct jinja
---
.../csi_driver/cinder/defaults/main.yml | 13 ++++++++++++-
.../cinder-csi-controllerplugin.yml.j2 | 18 ++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/roles/kubernetes-apps/csi_driver/cinder/defaults/main.yml b/roles/kubernetes-apps/csi_driver/cinder/defaults/main.yml
index 8776c3064..cc8c3b701 100644
--- a/roles/kubernetes-apps/csi_driver/cinder/defaults/main.yml
+++ b/roles/kubernetes-apps/csi_driver/cinder/defaults/main.yml
@@ -1,5 +1,4 @@
---
-
cinder_csi_attacher_image_tag: "v4.4.2"
cinder_csi_provisioner_image_tag: "v3.6.2"
cinder_csi_snapshotter_image_tag: "v6.3.2"
@@ -35,3 +34,15 @@ cinder_csi_controller_replicas: 1
# cinder_csi_rescan_on_resize: true
cinder_tolerations: []
+
+## Dictionaries of extra arguments to add to the cinder CSI plugin containers
+## Format:
+## cinder_csi_attacher_extra_args:
+## arg1: "value1"
+## arg2: "value2"
+cinder_csi_attacher_extra_args: {}
+cinder_csi_provisioner_extra_args: {}
+cinder_csi_snapshotter_extra_args: {}
+cinder_csi_resizer_extra_args: {}
+cinder_csi_plugin_extra_args: {}
+cinder_liveness_probe_extra_args: {}
diff --git a/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-controllerplugin.yml.j2 b/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-controllerplugin.yml.j2
index de27b7679..c541c89ff 100644
--- a/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-controllerplugin.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-controllerplugin.yml.j2
@@ -30,6 +30,9 @@ spec:
- --leader-election=true
{% endif %}
- "--default-fstype=ext4"
+{% for key, value in cinder_csi_attacher_extra_args.items() %}
+ - "{{ '--' + key + '=' + value }}"
+{% endfor %}
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
@@ -50,6 +53,9 @@ spec:
{% if cinder_csi_controller_replicas is defined and cinder_csi_controller_replicas > 1 %}
- "--leader-election=true"
{% endif %}
+{% for key, value in cinder_csi_provisioner_extra_args.items() %}
+ - "{{ '--' + key + '=' + value }}"
+{% endfor %}
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
@@ -66,6 +72,9 @@ spec:
{% if cinder_csi_controller_replicas is defined and cinder_csi_controller_replicas > 1 %}
- --leader-election=true
{% endif %}
+{% for key, value in cinder_csi_snapshotter_extra_args.items() %}
+ - "{{ '--' + key + '=' + value }}"
+{% endfor %}
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
@@ -82,6 +91,9 @@ spec:
{% if cinder_csi_controller_replicas is defined and cinder_csi_controller_replicas > 1 %}
- --leader-election=true
{% endif %}
+{% for key, value in cinder_csi_resizer_extra_args.items() %}
+ - "{{ '--' + key + '=' + value }}"
+{% endfor %}
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
@@ -93,6 +105,9 @@ spec:
imagePullPolicy: {{ k8s_image_pull_policy }}
args:
- "--csi-address=$(ADDRESS)"
+{% for key, value in cinder_liveness_probe_extra_args.items() %}
+ - "{{ '--' + key + '=' + value }}"
+{% endfor %}
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
@@ -107,6 +122,9 @@ spec:
- "--endpoint=$(CSI_ENDPOINT)"
- "--cloud-config=$(CLOUD_CONFIG)"
- "--cluster=$(CLUSTER_NAME)"
+{% for key, value in cinder_csi_plugin_extra_args.items() %}
+ - "{{ '--' + key + '=' + value }}"
+{% endfor %}
env:
- name: CSI_ENDPOINT
value: unix://csi/csi.sock
--
GitLab