From b59d5c35bc20d161a089aee2f9aecd7ba02493c8 Mon Sep 17 00:00:00 2001 From: Chad Swenson Date: Tue, 27 Nov 2018 21:30:43 -0600 Subject: [PATCH] Fix kubeadm_controller_extra_args (#3778) --- .../master/templates/kubeadm-config.v1alpha3.yaml.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 index 4376426c8..b9430c5a7 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 @@ -129,6 +129,9 @@ controllerManagerExtraArgs: {% if kube_feature_gates %} feature-gates: {{ kube_feature_gates|join(',') }} {% endif %} +{% for key in kube_kubeadm_controller_extra_args %} + {{ key }}: "{{ kube_kubeadm_controller_extra_args[key] }}" +{% endfor %} {% if cloud_provider is defined and cloud_provider in ["openstack", "azure", "vsphere", "aws"] %} cloud-provider: {{cloud_provider}} cloud-config: {{ kube_config_dir }}/cloud_config @@ -173,9 +176,6 @@ apiServerExtraVolumes: {% endif %} {% endif %} {% endif %} -{% for key in kube_kubeadm_controller_extra_args %} - {{ key }}: "{{ kube_kubeadm_controller_extra_args[key] }}" -{% endfor %} {% if cloud_provider is defined and cloud_provider in ["openstack", "azure", "vsphere", "aws", "external"] %} controllerManagerExtraVolumes: {% if cloud_provider is defined and cloud_provider in ["openstack"] and openstack_cacert is defined %}