From e17e4e110e7d226eeb33ed15710bd4dbb55d8413 Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@google.com>
Date: Tue, 14 Feb 2017 11:02:11 -0800
Subject: [PATCH] preserve kube-master-cert metadata over upgrades

---
 cluster/common.sh   | 3 +++
 cluster/gce/util.sh | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/cluster/common.sh b/cluster/common.sh
index 6c64946399..54ee24aa3f 100755
--- a/cluster/common.sh
+++ b/cluster/common.sh
@@ -1042,6 +1042,9 @@ function parse-master-env() {
   KUBELET_TOKEN=$(get-env-val "${master_env}" "KUBELET_TOKEN")
   KUBE_PROXY_TOKEN=$(get-env-val "${master_env}" "KUBE_PROXY_TOKEN")
   CA_CERT_BASE64=$(get-env-val "${master_env}" "CA_CERT")
+  CA_KEY_BASE64=$(get-env-val "${master_env}" "CA_KEY")
+  KUBEAPISERVER_CERT_BASE64=$(get-env-val "${master_env}" "KUBEAPISERVER_CERT")
+  KUBEAPISERVER_KEY_BASE64=$(get-env-val "${master_env}" "KUBEAPISERVER_KEY")
   EXTRA_DOCKER_OPTS=$(get-env-val "${master_env}" "EXTRA_DOCKER_OPTS")
   KUBELET_CERT_BASE64=$(get-env-val "${master_env}" "KUBELET_CERT")
   KUBELET_KEY_BASE64=$(get-env-val "${master_env}" "KUBELET_KEY")
diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index fe119957cd..b547182447 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -371,6 +371,9 @@ function get-master-env() {
   gcloud compute --project ${PROJECT} ssh --zone ${ZONE} ${KUBE_MASTER} --command \
     "curl --fail --silent -H 'Metadata-Flavor: Google' \
       'http://metadata/computeMetadata/v1/instance/attributes/kube-env'" 2>/dev/null
+  gcloud compute --project ${PROJECT} ssh --zone ${ZONE} ${KUBE_MASTER} --command \
+    "curl --fail --silent -H 'Metadata-Flavor: Google' \
+      'http://metadata/computeMetadata/v1/instance/attributes/kube-master-certs'" 2>/dev/null
 }
 
 # Robustly try to create a static ip.