Skip to content
Snippets Groups Projects
Commit 3cf59811 authored by Matt Calvert's avatar Matt Calvert Committed by Kubernetes Prow Robot
Browse files

Switch to use upstream kube_feature_gates logic

parent 4cc065e6
No related branches found
No related tags found
No related merge requests found
...@@ -92,8 +92,8 @@ networking: ...@@ -92,8 +92,8 @@ networking:
podSubnet: "{{ kube_pods_subnet }}{{ ',' + kube_pods_subnet_ipv6 if enable_dual_stack_networks }}" podSubnet: "{{ kube_pods_subnet }}{{ ',' + kube_pods_subnet_ipv6 if enable_dual_stack_networks }}"
{% if kube_feature_gates %} {% if kube_feature_gates %}
featureGates: featureGates:
{% for kube_feature_gate in kube_feature_gates %} {% for feature in kube_feature_gates %}
{{ kube_feature_gate.split("=")[0] }}: {{ kube_feature_gate.split("=")[1] }} {{ feature|replace("=", ": ") }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
kubernetesVersion: {{ kube_version }} kubernetesVersion: {{ kube_version }}
...@@ -371,12 +371,6 @@ conntrack: ...@@ -371,12 +371,6 @@ conntrack:
tcpCloseWaitTimeout: {{ kube_proxy_conntrack_tcp_close_wait_timeout }} tcpCloseWaitTimeout: {{ kube_proxy_conntrack_tcp_close_wait_timeout }}
tcpEstablishedTimeout: {{ kube_proxy_conntrack_tcp_established_timeout }} tcpEstablishedTimeout: {{ kube_proxy_conntrack_tcp_established_timeout }}
enableProfiling: {{ kube_proxy_enable_profiling }} 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 }} healthzBindAddress: {{ kube_proxy_healthz_bind_address }}
hostnameOverride: {{ kube_override_hostname }} hostnameOverride: {{ kube_override_hostname }}
iptables: iptables:
...@@ -426,7 +420,7 @@ clusterDNS: ...@@ -426,7 +420,7 @@ clusterDNS:
{% endfor %} {% endfor %}
{% if kube_feature_gates %} {% if kube_feature_gates %}
featureGates: featureGates:
{% for kube_feature_gate in kube_feature_gates %} {% for feature in kube_feature_gates %}
{{ kube_feature_gate.split("=")[0] }}: {{ kube_feature_gate.split("=")[1] }} {{ feature|replace("=", ": ") }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment