update to latest 2.26.0 kubespray version and add dns zones settings to coredns
This commit is contained in:
@@ -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: {}
|
||||
|
||||
@@ -7,5 +7,5 @@
|
||||
src: "{{ cinder_cacert }}"
|
||||
dest: "{{ kube_config_dir }}/cinder-cacert.pem"
|
||||
group: "{{ kube_cert_group }}"
|
||||
mode: 0640
|
||||
mode: "0640"
|
||||
delegate_to: "{{ delegate_host_to_write_cacert }}"
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
src: "cinder-csi-cloud-config.j2"
|
||||
dest: "{{ kube_config_dir }}/cinder_cloud_config"
|
||||
group: "{{ kube_cert_group }}"
|
||||
mode: 0640
|
||||
mode: "0640"
|
||||
when: inventory_hostname == groups['kube_control_plane'][0]
|
||||
|
||||
- name: Cinder CSI Driver | Get base64 cloud-config
|
||||
@@ -31,7 +31,7 @@
|
||||
template:
|
||||
src: "{{ item.file }}.j2"
|
||||
dest: "{{ kube_config_dir }}/{{ item.file }}"
|
||||
mode: 0644
|
||||
mode: "0644"
|
||||
with_items:
|
||||
- {name: cinder-csi-driver, file: cinder-csi-driver.yml}
|
||||
- {name: cinder-csi-cloud-config-secret, file: cinder-csi-cloud-config-secret.yml}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user