C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Support both --address and --bind-address for scheduler and controller-manager (#4112)

Browse source
This commit is contained in:
Danny Kulchinsky 2019-01-28 02:43:34 -05:00 committed by Kubernetes Prow Robot
parent 55aa58ee2e
commit 96688269f8
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2
View file

@ -129,7 +129,11 @@ 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 }}"
{% if kube_version is version('v1.14', '<') %}
address: {{ kube_controller_manager_bind_address }}
{% else %}
bind-address: {{ kube_controller_manager_bind_address }} bind-address: {{ kube_controller_manager_bind_address }}
{% endif %}
{% if kube_feature_gates %} {% if kube_feature_gates %}
feature-gates: {{ kube_feature_gates|join(',') }} feature-gates: {{ kube_feature_gates|join(',') }}
{% endif %} {% endif %}
@ -143,7 +147,11 @@ controllerManagerExtraArgs:
cloud-config: {{ kube_config_dir }}/cloud_config cloud-config: {{ kube_config_dir }}/cloud_config
{% endif %} {% endif %}
schedulerExtraArgs: schedulerExtraArgs:
{% if kube_version is version('v1.14', '<') %}
address: {{ kube_scheduler_bind_address }}
{% else %}
bind-address: {{ kube_scheduler_bind_address }} bind-address: {{ kube_scheduler_bind_address }}
{% endif %}
{% if kube_feature_gates %} {% if kube_feature_gates %}
feature-gates: {{ kube_feature_gates|join(',') }} feature-gates: {{ kube_feature_gates|join(',') }}
{% endif %} {% endif %}

8
roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
View file

@ -172,7 +172,11 @@ 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 }}"
{% if kube_version is version('v1.14', '<') %}
address: {{ kube_controller_manager_bind_address }}
{% else %}
bind-address: {{ kube_controller_manager_bind_address }} bind-address: {{ kube_controller_manager_bind_address }}
{% endif %}
{% if kube_feature_gates %} {% if kube_feature_gates %}
feature-gates: {{ kube_feature_gates|join(',') }} feature-gates: {{ kube_feature_gates|join(',') }}
{% endif %} {% endif %}
@ -206,7 +210,11 @@ controllerManager:
{% endif %} {% endif %}
scheduler: scheduler:
extraArgs: extraArgs:
{% if kube_version is version('v1.14', '<') %}
address: {{ kube_scheduler_bind_address }}
{% else %}
bind-address: {{ kube_scheduler_bind_address }} bind-address: {{ kube_scheduler_bind_address }}
{% endif %}
{% if kube_feature_gates %} {% if kube_feature_gates %}
feature-gates: {{ kube_feature_gates|join(',') }} feature-gates: {{ kube_feature_gates|join(',') }}
{% endif %} {% endif %}