Browse Source
Added apiserver extra args variable for kubeadm config (#2291)
pull/2307/merge
Maxim Krasilnikov
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
6 additions and
2 deletions
-
roles/kubernetes/master/defaults/main.yml
-
roles/kubernetes/master/templates/kubeadm-config.yaml.j2
-
roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
|
|
|
@ -83,6 +83,7 @@ controller_mgr_custom_flags: [] |
|
|
|
scheduler_custom_flags: [] |
|
|
|
|
|
|
|
## Extra args for k8s components passing by kubeadm |
|
|
|
kube_kubeadm_apiserver_extra_args: {} |
|
|
|
kube_kubeadm_controller_extra_args: {} |
|
|
|
kube_kubeadm_scheduler_extra_args: {} |
|
|
|
|
|
|
|
|
|
|
|
@ -58,6 +58,9 @@ apiServerExtraArgs: |
|
|
|
runtime-config: {{ kube_api_runtime_config | join(',') }} |
|
|
|
{% endif %} |
|
|
|
allow-privileged: "true" |
|
|
|
{% for key in kube_kubeadm_apiserver_extra_args %} |
|
|
|
{{ key }}: {{ kube_kubeadm_apiserver_extra_args[key] }} |
|
|
|
{% endfor %} |
|
|
|
controllerManagerExtraArgs: |
|
|
|
node-monitor-grace-period: {{ kube_controller_node_monitor_grace_period }} |
|
|
|
node-monitor-period: {{ kube_controller_node_monitor_period }} |
|
|
|
|
|
|
|
@ -115,9 +115,9 @@ spec: |
|
|
|
{% if apiserver_custom_flags is string %} |
|
|
|
- {{ apiserver_custom_flags }} |
|
|
|
{% else %} |
|
|
|
{% for flag in apiserver_custom_flags %} |
|
|
|
{% for flag in apiserver_custom_flags %} |
|
|
|
- {{ flag }} |
|
|
|
{% endfor %} |
|
|
|
{% endfor %} |
|
|
|
{% endif %} |
|
|
|
livenessProbe: |
|
|
|
httpGet: |
|
|
|
|
