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

Merge pull request #2644 from cp3hu/master

Browse Source 
Fix apiserver manifest and kubelet for kube version < 1.9
This commit is contained in:
Andreas Krüger
2018-05-08 09:22:36 +02:00
committed by GitHub
parent addd67dc63 3535c29e59
commit 28d6eb6af1
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,6 +125,9 @@ spec:
- --enable-aggregator-routing={{ kube_api_aggregator_routing }} - --enable-aggregator-routing={{ kube_api_aggregator_routing }}
- --proxy-client-cert-file={{ kube_cert_dir }}/front-proxy-client.pem - --proxy-client-cert-file={{ kube_cert_dir }}/front-proxy-client.pem
- --proxy-client-key-file={{ kube_cert_dir }}/front-proxy-client-key.pem - --proxy-client-key-file={{ kube_cert_dir }}/front-proxy-client-key.pem
{% else %}
- --proxy-client-cert-file={{ kube_cert_dir }}/apiserver.pem
- --proxy-client-key-file={{ kube_cert_dir }}/apiserver-key.pem
{% endif %} {% endif %}
{% if apiserver_custom_flags is string %} {% if apiserver_custom_flags is string %}
- {{ apiserver_custom_flags }} - {{ apiserver_custom_flags }}