Merge pull request #3202 from riverzhang/fix-ipvs

Fix ipvs by kubeadm v1alpha1
This commit is contained in:
k8s-ci-robot 2018-08-30 13:26:02 -07:00 committed by GitHub
commit aafd034ab8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -23,10 +23,16 @@ kubernetesVersion: {{ kube_version }}
{% if cloud_provider is defined and cloud_provider not in ["gce", "oci"] %} {% if cloud_provider is defined and cloud_provider not in ["gce", "oci"] %}
cloudProvider: {{ cloud_provider }} cloudProvider: {{ cloud_provider }}
{% endif %} {% endif %}
{% if kube_proxy_mode == 'ipvs' %}
kubeProxy: kubeProxy:
config: config:
{% if kube_proxy_mode == 'ipvs' and kube_version | version_compare('v1.10', '<') %} {% if kube_version | version_compare('v1.10', '<') %}
featureGates: SupportIPVSProxyMode=true featureGates: SupportIPVSProxyMode=true
{% endif %}
{% if kube_version | version_compare('v1.10', '>=') %}
featureGates:
SupportIPVSProxyMode: true
{% endif %}
mode: ipvs mode: ipvs
{% endif %} {% endif %}
{% if kube_proxy_nodeport_addresses %} {% if kube_proxy_nodeport_addresses %}