Merge pull request #63689 from awly/gce-fix-kubelet-ca-path

Automatic merge from submit-queue (batch tested with PRs 63969, 63902, 63689, 63973, 63978). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Reuse existing CA cert path for kubelet certs **What this PR does / why we need it**: configure-helper.sh already knows the path to CA cert, re-use that to avoid typos. **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #63689 from awly/gce-fix-kubelet-ca-path
bfca0d32 · Kubernetes Submit Queue · GitHub · 2d1f42e0 · 1c94d0bd · bfca0d32
Unverified Commit bfca0d32 authored May 18, 2018 by Kubernetes Submit Queue Committed by GitHub May 18, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

configure-helper.sh cluster/gce/gci/configure-helper.sh +2 -2

No files found.
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -1594,8 +1594,8 @@ function start-kube-apiserver {
  if [[ "${ENABLE_APISERVER_LOGS_HANDLER:-}" == "false" ]]; then
    params+=" --enable-logs-handler=false"
  fi
-  if [[ -n "${APISERVER_KUBELET_CA:-}" ]]; then
+  if [[ "${APISERVER_SET_KUBELET_CA:-false}" == "true" ]]; then
-    params+=" --kubelet-certificate-authority=${APISERVER_KUBELET_CA}"
+    params+=" --kubelet-certificate-authority=${CA_CERT_BUNDLE_PATH}"
  fi
  local admission_controller_config_mount=""