Merge pull request #2644 from cp3hu/master

Fix apiserver manifest and kubelet for kube version < 1.9
2018-05-08 09:22:36 +02:00 · 2018-05-08 09:22:36 +02:00 · 28d6eb6af1
parent addd67dc63 3535c29e59
commit 28d6eb6af1
1 changed files with 3 additions and 0 deletions
--- a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
+++ b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
@ -125,6 +125,9 @@ spec:
    - --enable-aggregator-routing={{ kube_api_aggregator_routing }}
    - --proxy-client-cert-file={{ kube_cert_dir }}/front-proxy-client.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 %}
 {% if apiserver_custom_flags is string %}
    - {{ apiserver_custom_flags }}