Browse Source
Merge pull request #2503 from woopstar/kubelet-fix-1
Fix duplicate --proxy-client-cert-file and --proxy-client-key-file
pull/2464/merge
Andreas Krüger
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
1 additions and
3 deletions
-
roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
-
roles/kubespray-defaults/defaults/main.yaml
|
|
|
@ -57,8 +57,6 @@ spec: |
|
|
|
{% endif %} |
|
|
|
- --tls-cert-file={{ kube_cert_dir }}/apiserver.pem |
|
|
|
- --tls-private-key-file={{ kube_cert_dir }}/apiserver-key.pem |
|
|
|
- --proxy-client-cert-file={{ kube_cert_dir }}/apiserver.pem |
|
|
|
- --proxy-client-key-file={{ kube_cert_dir }}/apiserver-key.pem |
|
|
|
{% if kube_token_auth|default(true) %} |
|
|
|
- --token-auth-file={{ kube_token_dir }}/known_tokens.csv |
|
|
|
{% endif %} |
|
|
|
|
|
|
|
@ -128,7 +128,7 @@ kube_apiserver_insecure_bind_address: 127.0.0.1 |
|
|
|
kube_apiserver_insecure_port: 8080 |
|
|
|
|
|
|
|
# Aggregator |
|
|
|
kube_api_aggregator_routing: true |
|
|
|
kube_api_aggregator_routing: false |
|
|
|
|
|
|
|
# Path used to store Docker data |
|
|
|
docker_daemon_graph: "/var/lib/docker" |
|
|
|
|
