C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2503 from woopstar/kubelet-fix-1

Browse source 
Fix duplicate --proxy-client-cert-file and --proxy-client-key-file
This commit is contained in:
Andreas Krüger 2018-03-21 10:03:31 +01:00 committed by GitHub
commit ff2b8e5e60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
View file

@ -57,8 +57,6 @@ spec:
{% endif %} {% endif %}
- --tls-cert-file={{ kube_cert_dir }}/apiserver.pem - --tls-cert-file={{ kube_cert_dir }}/apiserver.pem
- --tls-private-key-file={{ kube_cert_dir }}/apiserver-key.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) %} {% if kube_token_auth|default(true) %}
- --token-auth-file={{ kube_token_dir }}/known_tokens.csv - --token-auth-file={{ kube_token_dir }}/known_tokens.csv
{% endif %} {% endif %}

2
roles/kubespray-defaults/defaults/main.yaml
View file

@ -128,7 +128,7 @@ kube_apiserver_insecure_bind_address: 127.0.0.1
kube_apiserver_insecure_port: 8080 kube_apiserver_insecure_port: 8080
# Aggregator # Aggregator
kube_api_aggregator_routing: true kube_api_aggregator_routing: false
# Path used to store Docker data # Path used to store Docker data
docker_daemon_graph: "/var/lib/docker" docker_daemon_graph: "/var/lib/docker"