scl/kubespray
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3161 from nutellinoit/kube_proxy_nodeport_addresses

Browse Source 
--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
parent f765ed8f1c cb8be37f72
commit f97515352b
4 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
inventory/sample/group_vars/k8s-cluster.yml
View File

@ -107,6 +107,11 @@ kube_apiserver_insecure_port: 8080 # (http)
# Can be ipvs, iptables # Can be ipvs, iptables
kube_proxy_mode: iptables kube_proxy_mode: iptables
# Kube-proxy nodeport address.
# cidr to bind nodeport services. Flag --nodeport-addresses on kube-proxy manifest
kube_proxy_nodeport_addresses: false
# kube_proxy_nodeport_addresses_cidr: 10.0.1.0/24
## Encrypting Secret Data at Rest (experimental) ## Encrypting Secret Data at Rest (experimental)
kube_encrypt_secret_data: false kube_encrypt_secret_data: false

5
roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
View File

@ -22,12 +22,15 @@ 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' and kube_version | version_compare('v1.10', '<') %}
kubeProxy: kubeProxy:
config: config:
{% if kube_proxy_mode == 'ipvs' and kube_version | version_compare('v1.10', '<') %}
featureGates: SupportIPVSProxyMode=true featureGates: SupportIPVSProxyMode=true
mode: ipvs mode: ipvs
{% endif %} {% endif %}
{% if kube_proxy_nodeport_addresses %}
nodePortAddresses: [{{ kube_proxy_nodeport_addresses_cidr }}]
{% endif %}
authorizationModes: authorizationModes:
{% for mode in authorization_modes %} {% for mode in authorization_modes %}
- {{ mode }} - {{ mode }}

3
roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
View File

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

3
roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
View File

@ -43,6 +43,9 @@ spec:
- --proxy-mode={{ kube_proxy_mode }} - --proxy-mode={{ kube_proxy_mode }}
- --oom-score-adj=-998 - --oom-score-adj=-998
- --healthz-bind-address={{ kube_proxy_healthz_bind_address }} - --healthz-bind-address={{ kube_proxy_healthz_bind_address }}
{% if kube_proxy_nodeport_addresses %}
- --nodeport-addresses={{ kube_proxy_nodeport_addresses_cidr }}
{% endif %}
{% if kube_proxy_masquerade_all and kube_proxy_mode == "iptables" %} {% if kube_proxy_masquerade_all and kube_proxy_mode == "iptables" %}
- --masquerade-all - --masquerade-all
{% elif kube_proxy_mode == 'ipvs' %} {% elif kube_proxy_mode == 'ipvs' %}