External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-13 04:17:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Switch to use upstream kube_feature_gates logic

Browse Source
This commit is contained in:
Matt Calvert
2020-11-02 17:55:38 +00:00
committed by Kubernetes Prow Robot
parent 4cc065e66d
commit 3cf5981146
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
roles/kubernetes/control-plane/templates/kubeadm-config.v1beta2.yaml.j2
View File

@@ -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:
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:
@@ -401,9 +395,9 @@ portRange: {{ kube_proxy_port_range }}
udpIdleTimeout: {{ kube_proxy_udp_idle_timeout }} udpIdleTimeout: {{ kube_proxy_udp_idle_timeout }}
{% if kube_feature_gates %} {% if kube_feature_gates %}
featureGates: featureGates:
{% for feature in kube_feature_gates %} {% for feature in kube_feature_gates %}
{{ feature|replace("=", ": ") }} {{ feature|replace("=", ": ") }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{# DNS settings for kubelet #} {# DNS settings for kubelet #}
{% if enable_nodelocaldns %} {% if enable_nodelocaldns %}
@@ -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 %}