Fix ipvs by kubeadm v1alpha1

2018-08-30 23:04:57 +08:00 · 2018-08-30 23:04:57 +08:00 · 16fc22a207
parent d9ea937493
commit 16fc22a207
1 changed files with 7 additions and 1 deletions
--- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
@ -23,10 +23,16 @@ kubernetesVersion: {{ kube_version }}
 {% if cloud_provider is defined and cloud_provider not in ["gce", "oci"] %}
 cloudProvider: {{ cloud_provider }}
 {% endif %}
+{% if kube_proxy_mode == 'ipvs' %}
 kubeProxy:
  config:
-{% if kube_proxy_mode == 'ipvs' and kube_version | version_compare('v1.10', '<') %}
+{% if kube_version | version_compare('v1.10', '<') %}
    featureGates: SupportIPVSProxyMode=true
+{% endif %}
+{% if kube_version | version_compare('v1.10', '>=') %}
+    featureGates:
+      SupportIPVSProxyMode: true
+{% endif %}
    mode: ipvs
 {% endif %}
 {% if kube_proxy_nodeport_addresses %}