Merge pull request #3161 from nutellinoit/kube_proxy_nodeport_addresses

--nodeport-addresses added on kube-proxy.manifest.j2 and on k8s-cluster.yml
This commit is contained in:
k8s-ci-robot
2018-08-25 02:00:19 -07:00
committed by GitHub
4 changed files with 15 additions and 1 deletions

View File

@@ -22,12 +22,15 @@ kubernetesVersion: {{ kube_version }}
{% if cloud_provider is defined and cloud_provider not in ["gce", "oci"] %}
cloudProvider: {{ cloud_provider }}
{% endif %}
{% if kube_proxy_mode == 'ipvs' and kube_version | version_compare('v1.10', '<') %}
kubeProxy:
config:
{% if kube_proxy_mode == 'ipvs' and kube_version | version_compare('v1.10', '<') %}
featureGates: SupportIPVSProxyMode=true
mode: ipvs
{% endif %}
{% if kube_proxy_nodeport_addresses %}
nodePortAddresses: [{{ kube_proxy_nodeport_addresses_cidr }}]
{% endif %}
authorizationModes:
{% for mode in authorization_modes %}
- {{ mode }}

View File

@@ -27,6 +27,9 @@ kubeProxy:
config:
mode: {{ kube_proxy_mode }}
hostnameOverride: {{ inventory_hostname }}
{% if kube_proxy_nodeport_addresses %}
nodePortAddresses: [{{ kube_proxy_nodeport_addresses_cidr }}]
{% endif %}
authorizationModes:
{% for mode in authorization_modes %}
- {{ mode }}