Merge pull request #25 from kishen-v/update-template

Fix kubeadm config templation

Author: k8s-ci-robot

kubetest2-tf/data/k8s-ansible/roles/install-k8s/templates/kubeadm.yaml.j2

@@ -21,7 +21,7 @@ nodeRegistration:
       value: {{ cgroup_driver }}
 {% if (feature_gates is defined) %}
     - name: feature-gates
-      value: "{{ feature_gates | join(',') }}"
+      value: "{{ feature_gates }}"
 {% endif %}
 timeouts:
   controlPlaneComponentHealthCheck: 4m0s
@@ -41,7 +41,7 @@ apiServer:
 {% if (feature_gates is defined) and (runtime_config is defined) %}
   extraArgs:
     - name: feature-gates
-      value: "{{ feature_gates | join(',') }}"
+      value: "{{ feature_gates }}"
     - name: runtime-config
       value: {{ runtime_config }}
 {% endif %}
@@ -60,23 +60,23 @@ controllerManager:
       value: "0.0.0.0"
 {% if feature_gates is defined %}
     - name: feature-gates
-      value: "{{ feature_gates | join(',') }}"
+      value: "{{ feature_gates }}"
 {% endif %}
 scheduler:
   extraArgs:
     - name: bind-address
       value: "0.0.0.0"
 {% if feature_gates is defined %}
     - name: feature-gates
-      value: "{{ feature_gates | join(',') }}"
+      value: "{{ feature_gates }}"
 {% endif %}
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 cgroupDriver: {{ cgroup_driver }}
 {% if feature_gates is defined %}
 featureGates:
-{%   for feature in feature_gates %}
+{%   for feature in feature_gates.split(',') %}
   {{ feature | replace("=", ": ") }}
 {%   endfor %}
 {% endif %}
@@ -96,10 +96,6 @@ discovery:
     unsafeSkipCAVerification: true
   tlsBootstrapToken: {{ bootstrap_token }}
 nodeRegistration:
-{% if (feature_gates is defined) %}
-  kubeletExtraArgs:
-    feature-gates: "{{ feature_gates | join(',') }}"
-{% endif %}
 {% if (runtime is defined) and 'containerd' == runtime %}
   criSocket: "unix:///run/containerd/containerd.sock"
 {% elif (runtime is defined) and 'crio' == runtime %}