From ec44cc2e7c8b45518409bf794a6e61792a5b3546 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 1 May 2017 14:32:42 -0400 Subject: [PATCH] Allow specifying cluster signing ca/key Makes it useful in testing some scenarios with automatically signing certificates --- hack/local-up-cluster.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh index e7ac7f63890..0bd4f9d3dc3 100755 --- 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}" \