Skip to content

Commit 20b37d6

Browse files
committed
Add IP rotation flags and env-vars to configure-*.sh
1 parent ba2855e commit 20b37d6

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

cluster/gce/gci/configure-helper.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,13 @@ function create-master-pki {
564564
SERVICEACCOUNT_KEY="${MASTER_KEY}"
565565
fi
566566

567+
if [[ -n "${OLD_MASTER_CERT:-}" && -n "${OLD_MASTER_KEY:-}" ]]; then
568+
OLD_MASTER_CERT_PATH="${pki_dir}/oldapiserver.crt"
569+
echo "${OLD_MASTER_CERT}" | base64 --decode > "${OLD_MASTER_CERT_PATH}"
570+
OLD_MASTER_KEY_PATH="${pki_dir}/oldapiserver.key"
571+
echo "${OLD_MASTER_KEY}" | base64 --decode > "${OLD_MASTER_KEY_PATH}"
572+
fi
573+
567574
SERVICEACCOUNT_CERT_PATH="${pki_dir}/serviceaccount.crt"
568575
write-pki-data "${SERVICEACCOUNT_CERT}" "${SERVICEACCOUNT_CERT_PATH}"
569576

cluster/gce/gci/configure-kubeapiserver.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,13 @@ function start-kube-apiserver {
8282
fi
8383
params+=" --tls-cert-file=${APISERVER_SERVER_CERT_PATH}"
8484
params+=" --tls-private-key-file=${APISERVER_SERVER_KEY_PATH}"
85+
if [[ -n "${OLD_MASTER_IP:-}" ]]; then
86+
local old_ips="${OLD_MASTER_IP}"
87+
if [[ -n "${OLD_LOAD_BALANCER_IP}" ]]; then
88+
old_ips+=",${OLD_LOAD_BALANCER_IP}"
89+
fi
90+
params+=" --tls-sni-cert-key=${OLD_MASTER_CERT_PATH},${OLD_MASTER_KEY_PATH}:${old_ips}"
91+
fi
8592
params+=" --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname"
8693
if [[ -s "${REQUESTHEADER_CA_CERT_PATH:-}" ]]; then
8794
params+=" --requestheader-client-ca-file=${REQUESTHEADER_CA_CERT_PATH}"

0 commit comments

Comments
 (0)