Add extra arguments variables for openstack and vsphere cloud controller manager daemonsets (#6783)

This commit is contained in:
Joren Zandstra 2020-10-02 19:14:48 +02:00 committed by GitHub
parent 58959ae82f
commit 9729b6b75a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 0 deletions

View file

@ -12,4 +12,10 @@ external_openstack_domain_name: "{{ lookup('env','OS_USER_DOMAIN_NAME') }}"
external_openstack_domain_id: "{{ lookup('env','OS_USER_DOMAIN_ID') }}" external_openstack_domain_id: "{{ lookup('env','OS_USER_DOMAIN_ID') }}"
external_openstack_cacert: "{{ lookup('env','OS_CACERT') }}" external_openstack_cacert: "{{ lookup('env','OS_CACERT') }}"
## A dictionary of extra arguments to add to the openstack cloud controller manager daemonset
## Format:
## external_openstack_cloud_controller_extra_args:
## arg1: "value1"
## arg2: "value2"
external_openstack_cloud_controller_extra_args: {}
external_openstack_cloud_controller_image_tag: "v1.18.2" external_openstack_cloud_controller_image_tag: "v1.18.2"

View file

@ -44,6 +44,9 @@ spec:
- --cloud-provider=openstack - --cloud-provider=openstack
- --use-service-account-credentials=true - --use-service-account-credentials=true
- --address=127.0.0.1 - --address=127.0.0.1
{% for key, value in external_openstack_cloud_controller_extra_args.items() %}
- "{{ '--' + key + '=' + value }}"
{% endfor %}
volumeMounts: volumeMounts:
- mountPath: /etc/kubernetes/pki - mountPath: /etc/kubernetes/pki
name: k8s-certs name: k8s-certs

View file

@ -2,4 +2,10 @@
external_vsphere_vcenter_port: "443" external_vsphere_vcenter_port: "443"
external_vsphere_insecure: "true" external_vsphere_insecure: "true"
## A dictionary of extra arguments to add to the vsphere cloud controller manager daemonset
## Format:
## external_vsphere_cloud_controller_extra_args:
## arg1: "value1"
## arg2: "value2"
external_vsphere_cloud_controller_extra_args: {}
external_vsphere_cloud_controller_image_tag: "latest" external_vsphere_cloud_controller_image_tag: "latest"

View file

@ -41,6 +41,9 @@ spec:
- --v=2 - --v=2
- --cloud-provider=vsphere - --cloud-provider=vsphere
- --cloud-config=/etc/cloud/vsphere.conf - --cloud-config=/etc/cloud/vsphere.conf
{% for key, value in external_vsphere_cloud_controller_extra_args.items() %}
- "{{ '--' + key + '=' + value }}"
{% endfor %}
volumeMounts: volumeMounts:
- mountPath: /etc/cloud - mountPath: /etc/cloud
name: vsphere-config-volume name: vsphere-config-volume