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

Allow override of bind addr for controller-manager and scheduler (#3968)

Browse source 
* allows to override the bind addresses for controller-manager and scheduler

Useful for Prometheus metrics monitoring

* Add bind addr override support in kubeadm/v1beta1

Adds support for override of bind addresses for controller-manager
and scheduler in kubeadm/v1beta1

* Move location of bind address vars

* Remove double declaration of schedulerExtraArgs
This commit is contained in:
Andreas Holmsten 2019-01-08 05:41:54 +01:00 committed by Kubernetes Prow Robot
parent 39d7503069
commit 4d5b41b8db
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roles/kubernetes/master/defaults/main/main.yml
View file

@ -23,6 +23,11 @@ kube_apiserver_storage_backend: etcd3
# By default, force back to etcd2. Set to true to force etcd3 (experimental!) # By default, force back to etcd2. Set to true to force etcd3 (experimental!)
force_etcd3: false force_etcd3: false
# Associated interfaces must be reachable by the rest of the cluster, and by
# CLI/web clients.
kube_controller_manager_bind_address: 0.0.0.0
kube_scheduler_bind_address: 0.0.0.0
# audit support # audit support
kubernetes_audit: false kubernetes_audit: false
# path to audit log file # path to audit log file

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

@ -129,6 +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 }}
{% if kube_feature_gates %} {% if kube_feature_gates %}
feature-gates: {{ kube_feature_gates|join(',') }} feature-gates: {{ kube_feature_gates|join(',') }}
{% endif %} {% endif %}
@ -142,6 +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 }}
{% if kube_feature_gates %} {% if kube_feature_gates %}
feature-gates: {{ kube_feature_gates|join(',') }} feature-gates: {{ kube_feature_gates|join(',') }}
{% endif %} {% endif %}

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

@ -172,6 +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 }}
{% if kube_feature_gates %} {% if kube_feature_gates %}
feature-gates: {{ kube_feature_gates|join(',') }} feature-gates: {{ kube_feature_gates|join(',') }}
{% endif %} {% endif %}
@ -205,6 +206,7 @@ controllerManager:
{% endif %} {% endif %}
scheduler: scheduler:
extraArgs: extraArgs:
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 %}