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

Added apiserver extra args variable for kubeadm config (#2291)

pull/2307/merge
Maxim Krasilnikov 2018-02-12 10:29:46 +03:00 committed by GitHub
parent 46284198f8
commit 03c61685fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/kubernetes/master/defaults/main.yml
View File

@ -83,6 +83,7 @@ controller_mgr_custom_flags: []
scheduler_custom_flags: [] scheduler_custom_flags: []
## Extra args for k8s components passing by kubeadm ## Extra args for k8s components passing by kubeadm
kube_kubeadm_apiserver_extra_args: {}
kube_kubeadm_controller_extra_args: {} kube_kubeadm_controller_extra_args: {}
kube_kubeadm_scheduler_extra_args: {} kube_kubeadm_scheduler_extra_args: {}

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

@ -58,6 +58,9 @@ apiServerExtraArgs:
runtime-config: {{ kube_api_runtime_config | join(',') }} runtime-config: {{ kube_api_runtime_config | join(',') }}
{% endif %} {% endif %}
allow-privileged: "true" allow-privileged: "true"
{% for key in kube_kubeadm_apiserver_extra_args %}
{{ key }}: {{ kube_kubeadm_apiserver_extra_args[key] }}
{% endfor %}
controllerManagerExtraArgs: controllerManagerExtraArgs:
node-monitor-grace-period: {{ kube_controller_node_monitor_grace_period }} node-monitor-grace-period: {{ kube_controller_node_monitor_grace_period }}
node-monitor-period: {{ kube_controller_node_monitor_period }} node-monitor-period: {{ kube_controller_node_monitor_period }}

4
roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
View File

@ -115,9 +115,9 @@ spec:
{% if apiserver_custom_flags is string %} {% if apiserver_custom_flags is string %}
- {{ apiserver_custom_flags }} - {{ apiserver_custom_flags }}
{% else %} {% else %}
{% for flag in apiserver_custom_flags %} {% for flag in apiserver_custom_flags %}
- {{ flag }} - {{ flag }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
livenessProbe: livenessProbe:
httpGet: httpGet: