kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4026 from riverzhang/bind-address 

Use --bind-address instead of --address
pull/3984/head
Chad Swenson 2019-01-14 15:35:00 -06:00 committed by GitHub
parent 1e09fd8e0f bab2e5ed0d
commit 301671ae19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2
View File

@ -129,7 +129,7 @@ controllerManagerExtraArgs:
node-monitor-period: {{ kube_controller_node_monitor_period }} node-monitor-period: {{ kube_controller_node_monitor_period }}
pod-eviction-timeout: {{ kube_controller_pod_eviction_timeout }} pod-eviction-timeout: {{ kube_controller_pod_eviction_timeout }}
node-cidr-mask-size: "{{ kube_network_node_prefix }}" node-cidr-mask-size: "{{ kube_network_node_prefix }}"
address: {{ kube_controller_manager_bind_address }} bind-address: {{ kube_controller_manager_bind_address }}
{% if kube_feature_gates %} {% if kube_feature_gates %}
feature-gates: {{ kube_feature_gates|join(',') }} feature-gates: {{ kube_feature_gates|join(',') }}
{% endif %} {% endif %}
@ -143,7 +143,7 @@ controllerManagerExtraArgs:
cloud-config: {{ kube_config_dir }}/cloud_config cloud-config: {{ kube_config_dir }}/cloud_config
{% endif %} {% endif %}
schedulerExtraArgs: schedulerExtraArgs:
address: {{ kube_scheduler_bind_address }} bind-address: {{ kube_scheduler_bind_address }}
{% if kube_feature_gates %} {% if kube_feature_gates %}
feature-gates: {{ kube_feature_gates|join(',') }} feature-gates: {{ kube_feature_gates|join(',') }}
{% endif %} {% endif %}

4
roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
View File

@ -172,7 +172,7 @@ controllerManager:
node-monitor-period: {{ kube_controller_node_monitor_period }} node-monitor-period: {{ kube_controller_node_monitor_period }}
pod-eviction-timeout: {{ kube_controller_pod_eviction_timeout }} pod-eviction-timeout: {{ kube_controller_pod_eviction_timeout }}
node-cidr-mask-size: "{{ kube_network_node_prefix }}" node-cidr-mask-size: "{{ kube_network_node_prefix }}"
address: {{ kube_controller_manager_bind_address }} bind-address: {{ kube_controller_manager_bind_address }}
{% if kube_feature_gates %} {% if kube_feature_gates %}
feature-gates: {{ kube_feature_gates|join(',') }} feature-gates: {{ kube_feature_gates|join(',') }}
{% endif %} {% endif %}
@ -206,7 +206,7 @@ controllerManager:
{% endif %} {% endif %}
scheduler: scheduler:
extraArgs: extraArgs:
address: {{ kube_controller_manager_bind_address }} bind-address: {{ kube_scheduler_bind_address }}
{% if kube_feature_gates %} {% if kube_feature_gates %}
feature-gates: {{ kube_feature_gates|join(',') }} feature-gates: {{ kube_feature_gates|join(',') }}
{% endif %} {% endif %}