Merge pull request kubernetes-retired#606 from danielfm/tls-booststra…

…p-fix Fix certs path when TLS bootstrapping is enabled
HotelsDotCom · Apr 28, 2017 · a056b25 · a056b25
2 parents 60c64a1 + 430f69f
commit a056b25
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/core/controlplane/config/templates/cloud-config-worker b/core/controlplane/config/templates/cloud-config-worker
@@ -818,8 +818,13 @@ write_files:
           "policy": {
             "type": "k8s",
             "k8s_api_root": "{{.APIEndpointURL}}/api/v1/",
+            {{- if .Experimental.TLSBootstrap.Enabled }}
+            "k8s_client_key": "/etc/kubernetes/ssl/kubelet-client.key",
+            "k8s_client_certificate": "/etc/kubernetes/ssl/kubelet-client.crt",
+            {{- else }}
             "k8s_client_key": "/etc/kubernetes/ssl/worker-key.pem",
             "k8s_client_certificate": "/etc/kubernetes/ssl/worker.pem",
+            {{- end }}
             "k8s_certificate_authority": "/etc/kubernetes/ssl/ca.pem"
           }
         }