Skip to content
Snippets Groups Projects
Commit 96688269 authored by Danny Kulchinsky's avatar Danny Kulchinsky Committed by Kubernetes Prow Robot
Browse files

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

parent 55aa58ee
No related branches found
No related tags found
No related merge requests found
......@@ -129,7 +129,11 @@ controllerManagerExtraArgs:
node-monitor-period: {{ kube_controller_node_monitor_period }}
pod-eviction-timeout: {{ kube_controller_pod_eviction_timeout }}
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 }}
{% endif %}
{% if kube_feature_gates %}
feature-gates: {{ kube_feature_gates|join(',') }}
{% endif %}
......@@ -143,7 +147,11 @@ controllerManagerExtraArgs:
cloud-config: {{ kube_config_dir }}/cloud_config
{% endif %}
schedulerExtraArgs:
{% if kube_version is version('v1.14', '<') %}
address: {{ kube_scheduler_bind_address }}
{% else %}
bind-address: {{ kube_scheduler_bind_address }}
{% endif %}
{% if kube_feature_gates %}
feature-gates: {{ kube_feature_gates|join(',') }}
{% endif %}
......
......@@ -172,7 +172,11 @@ controllerManager:
node-monitor-period: {{ kube_controller_node_monitor_period }}
pod-eviction-timeout: {{ kube_controller_pod_eviction_timeout }}
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 }}
{% endif %}
{% if kube_feature_gates %}
feature-gates: {{ kube_feature_gates|join(',') }}
{% endif %}
......@@ -206,7 +210,11 @@ controllerManager:
{% endif %}
scheduler:
extraArgs:
{% if kube_version is version('v1.14', '<') %}
address: {{ kube_scheduler_bind_address }}
{% else %}
bind-address: {{ kube_scheduler_bind_address }}
{% endif %}
{% if kube_feature_gates %}
feature-gates: {{ kube_feature_gates|join(',') }}
{% endif %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment