Merge pull request #45177 from dims/allow-cluster-signing-ca-crt-and-key

Automatic merge from submit-queue (batch tested with PRs 45077, 45180, 34727, 45079, 45177) Allow specifying cluster signing ca/key **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note ```

Merge pull request #45177 from dims/allow-cluster-signing-ca-crt-and-key
29f37fde · Kubernetes Submit Queue · GitHub · e80ec73a · ec44cc2e · 29f37fde
Commit 29f37fde authored May 01, 2017 by Kubernetes Submit Queue Committed by GitHub May 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

local-up-cluster.sh hack/local-up-cluster.sh +4 -2

No files found.
--- a/hack/local-up-cluster.sh
+++ b/hack/local-up-cluster.sh
@@ -213,6 +213,8 @@ ENABLE_CONTROLLER_ATTACH_DETACH=${ENABLE_CONTROLLER_ATTACH_DETACH:-"true"} # cur
 CERT_DIR=${CERT_DIR:-"/var/run/kubernetes"}
 ROOT_CA_FILE=${CERT_DIR}/server-ca.crt
 ROOT_CA_KEY=${CERT_DIR}/server-ca.key
+CLUSTER_SIGNING_CERT_FILE=${CLUSTER_SIGNING_CERT_FILE:-"${ROOT_CA_FILE}"}
+CLUSTER_SIGNING_KEY_FILE=${CLUSTER_SIGNING_KEY_FILE:-"${ROOT_CA_KEY}"}

 # name of the cgroup driver, i.e. cgroupfs or systemd
 if [[ ${CONTAINER_RUNTIME} == "docker" ]]; then
@@ -545,8 +547,8 @@ function start_controller_manager {
      --v=${LOG_LEVEL} \
      --service-account-private-key-file="${SERVICE_ACCOUNT_KEY}" \
      --root-ca-file="${ROOT_CA_FILE}" \
-      --cluster-signing-cert-file="${ROOT_CA_FILE}" \
-      --cluster-signing-key-file="${ROOT_CA_KEY}" \
+      --cluster-signing-cert-file="${CLUSTER_SIGNING_CERT_FILE}" \
+      --cluster-signing-key-file="${CLUSTER_SIGNING_KEY_FILE}" \
      --enable-hostpath-provisioner="${ENABLE_HOSTPATH_PROVISIONER}" \
      ${node_cidr_args} \
      --pvclaimbinder-sync-period="${CLAIM_BINDER_SYNC_PERIOD}" \