From c6e2a4ebd850ef6665117fbc2a7caea942e63a9c Mon Sep 17 00:00:00 2001
From: Maciej <maciejaszek@users.noreply.github.com>
Date: Thu, 22 Oct 2020 12:39:34 +0200
Subject: [PATCH] Set feature gates in kube-proxy ConfigMap (#6851)

Command line flags aren't added to kube-proxy which results in missing
feature gates set in this component. Add appropriate setting to
ConfigMap instead.

Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>
---
 .../master/templates/kubeadm-config.v1beta2.yaml.j2         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2
index c0d5b5316..8c3041d79 100644
--- a/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2
@@ -375,6 +375,12 @@ nodePortAddresses: {{ kube_proxy_nodeport_addresses }}
 oomScoreAdj: {{ kube_proxy_oom_score_adj }}
 portRange: {{ kube_proxy_port_range }}
 udpIdleTimeout: {{ kube_proxy_udp_idle_timeout }}
+{% if kube_feature_gates %}
+featureGates:
+{% for feature in kube_feature_gates %}
+  {{ feature|replace("=", ": ") }}
+{% endfor %}
+{% endif %}
 {# DNS settings for kubelet #}
 {% if enable_nodelocaldns %}
 {% set kubelet_cluster_dns = [nodelocaldns_ip] %}