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

Added optional controller and scheduler extra args to kubeadm config (#2205)

Browse source
This commit is contained in:
Maxim Krasilnikov 2018-02-05 16:49:13 +03:00 committed by Matthew Mosesohn
parent bd1f0bcfd7
commit 95b8ac5f62
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,8 +83,11 @@ controller_mgr_custom_flags: []
scheduler_custom_flags: [] scheduler_custom_flags: []
# kubeadm settings # kubeadm settings
# Value of 0 means it never expires ## Value of 0 means it never expires
kubeadm_token_ttl: 0 kubeadm_token_ttl: 0
## Extra args for k8s components passing by kubeadm
kube_kubeadm_controller_extra_args: {}
kube_kubeadm_scheduler_extra_args: {}
## Variable for influencing kube-scheduler behaviour ## Variable for influencing kube-scheduler behaviour
volume_cross_zone_attachment: false volume_cross_zone_attachment: false

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

@ -67,6 +67,15 @@ controllerManagerExtraArgs:
{% if kube_feature_gates %} {% if kube_feature_gates %}
feature-gates: {{ kube_feature_gates|join(',') }} feature-gates: {{ kube_feature_gates|join(',') }}
{% endif %} {% endif %}
{% for key in kube_kubeadm_controller_extra_args %}
{{ key }}: {{ kube_kubeadm_controller_extra_args[key] }}
{% endfor %}
{% if kube_kubeadm_scheduler_extra_args|length > 0 %}
schedulerExtraArgs:
{% for key in kube_kubeadm_scheduler_extra_args %}
{{ key }}: {{ kube_kubeadm_scheduler_extra_args[key] }}
{% endfor %}
{% endif %}
apiServerCertSANs: apiServerCertSANs:
{% for san in apiserver_sans.split(' ') | unique %} {% for san in apiserver_sans.split(' ') | unique %}
- {{ san }} - {{ san }}