From 3cf598114654e28f791cfe6854d1a831bc14d3c7 Mon Sep 17 00:00:00 2001
From: Matt Calvert <miff2000@users.noreply.github.com>
Date: Mon, 2 Nov 2020 17:55:38 +0000
Subject: [PATCH] Switch to use upstream kube_feature_gates logic

---
 .../templates/kubeadm-config.v1beta2.yaml.j2   | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta2.yaml.j2 b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta2.yaml.j2
index 325e13345..37f2debbd 100644
--- a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta2.yaml.j2
+++ b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta2.yaml.j2
@@ -92,8 +92,8 @@ networking:
   podSubnet: "{{ kube_pods_subnet }}{{ ',' + kube_pods_subnet_ipv6 if enable_dual_stack_networks }}"
 {% if kube_feature_gates %}
 featureGates:
-{%   for kube_feature_gate in kube_feature_gates %}
-  {{ kube_feature_gate.split("=")[0] }}: {{ kube_feature_gate.split("=")[1] }}
+{%   for feature in kube_feature_gates %}
+  {{ feature|replace("=", ": ") }}
 {%   endfor %}
 {% endif %}
 kubernetesVersion: {{ kube_version }}
@@ -371,12 +371,6 @@ conntrack:
   tcpCloseWaitTimeout: {{ kube_proxy_conntrack_tcp_close_wait_timeout }}
   tcpEstablishedTimeout: {{ kube_proxy_conntrack_tcp_established_timeout }}
 enableProfiling: {{ kube_proxy_enable_profiling }}
-{% if kube_feature_gates %}
-featureGates:
-{%   for kube_feature_gate in kube_feature_gates %}
-  {{ kube_feature_gate.split("=")[0] }}: {{ kube_feature_gate.split("=")[1] }}
-{%   endfor %}
-{% endif %}
 healthzBindAddress: {{ kube_proxy_healthz_bind_address }}
 hostnameOverride: {{ kube_override_hostname }}
 iptables:
@@ -401,9 +395,9 @@ portRange: {{ kube_proxy_port_range }}
 udpIdleTimeout: {{ kube_proxy_udp_idle_timeout }}
 {% if kube_feature_gates %}
 featureGates:
-{% for feature in kube_feature_gates %}
+{%   for feature in kube_feature_gates %}
   {{ feature|replace("=", ": ") }}
-{% endfor %}
+{%   endfor %}
 {% endif %}
 {# DNS settings for kubelet #}
 {% if enable_nodelocaldns %}
@@ -426,7 +420,7 @@ clusterDNS:
 {% endfor %}
 {% if kube_feature_gates %}
 featureGates:
-{%   for kube_feature_gate in kube_feature_gates %}
-  {{ kube_feature_gate.split("=")[0] }}: {{ kube_feature_gate.split("=")[1] }}
+{%   for feature in kube_feature_gates %}
+  {{ feature|replace("=", ": ") }}
 {%   endfor %}
 {% endif %}