Browse Source
Merge pull request #2644 from cp3hu/master
Fix apiserver manifest and kubelet for kube version < 1.9
pull/2703/merge
Andreas Krüger
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
0 deletions
-
roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
|
|
@ -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 }} |
|
|
|
