epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-09 11:47:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Sync manifests with kubeadm (#3383)

Browse Source
This commit is contained in:
Andreas Krüger
2018-09-24 11:17:18 +02:00
committed by k8s-ci-robot
parent 02de35cfc3
commit d6ebe8c3e7
5 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,6 +73,7 @@ spec:
- --kubelet-client-key={{ kube_cert_dir }}/node-{{ inventory_hostname }}-key.pem
- --service-account-lookup=true
- --kubelet-preferred-address-types={{ kubelet_preferred_address_types }}
- --request-timeout={{ kube_apiserver_request_timeout }}
{% if kube_basic_auth|default(true) %}
- --basic-auth-file={{ kube_users_dir }}/known_users.csv
{% endif %}

2
roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2
View File

@@ -38,7 +38,7 @@ spec:
- --node-monitor-period={{ kube_controller_node_monitor_period }}
- --pod-eviction-timeout={{ kube_controller_pod_eviction_timeout }}
- --profiling={{ kube_profiling }}
- --terminated-pod-gc-threshold=12500
- --terminated-pod-gc-threshold={{ kube_controller_terminated_pod_gc_threshold }}
- --v={{ kube_log_level }}
{% if rbac_enabled %}
- --use-service-account-credentials=true