Skip to content
Snippets Groups Projects
Unverified Commit 28d6eb6a authored by Andreas Krüger's avatar Andreas Krüger Committed by GitHub
Browse files

Merge pull request #2644 from cp3hu/master 

Fix apiserver manifest and kubelet for kube version < 1.9
parents addd67dc 3535c29e
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
+ 3
− 0
View file @ 28d6eb6a
...@@ -125,6 +125,9 @@ spec: ...@@ -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 }}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment