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

Fix duplicate --proxy-client-cert-file and --proxy-client-key-file

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

@@ -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 %}

roles/kubespray-defaults/defaults/main.yaml

@@ -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"