From d1a73fa5cda94e875c1e9cda0e4bbd3569f8454c Mon Sep 17 00:00:00 2001
From: Jerzy Szczepkowski <jsz@google.com>
Date: Fri, 20 Jan 2017 13:24:09 +0100
Subject: [PATCH] Fixed propagation of kube master certs during master
 replication.

Fixed propagation of kube master certs during master replication.
---
 cluster/gce/debian/master-helper.sh | 1 +
 cluster/gce/gci/master-helper.sh    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cluster/gce/debian/master-helper.sh b/cluster/gce/debian/master-helper.sh
index f4e3f40772d..70349a223b2 100755
--- a/cluster/gce/debian/master-helper.sh
+++ b/cluster/gce/debian/master-helper.sh
@@ -66,6 +66,7 @@ function replicate-master-instance() {
   echo "${kube_env}" > ${KUBE_TEMP}/master-kube-env.yaml
   get-metadata "${existing_master_zone}" "${existing_master_name}" cluster-name > ${KUBE_TEMP}/cluster-name.txt
   get-metadata "${existing_master_zone}" "${existing_master_name}" startup-script > ${KUBE_TEMP}/configure-vm.sh
+  get-metadata "${existing_master_zone}" "${existing_master_name}" kube-master-certs > "${KUBE_TEMP}/kube-master-certs.yaml"
 
   create-master-instance-internal "${REPLICA_NAME}"
 }
diff --git a/cluster/gce/gci/master-helper.sh b/cluster/gce/gci/master-helper.sh
index 35365a1f7f6..b81748941e9 100755
--- a/cluster/gce/gci/master-helper.sh
+++ b/cluster/gce/gci/master-helper.sh
@@ -50,7 +50,6 @@ function replicate-master-instance() {
   kube_env="$(echo -e "${kube_env}\nINITIAL_ETCD_CLUSTER: '${existing_master_replicas},${REPLICA_NAME}'")"
   ETCD_CA_KEY="$(echo "${kube_env}" | grep "ETCD_CA_KEY" |  sed "s/^.*: '//" | sed "s/'$//")"
   ETCD_CA_CERT="$(echo "${kube_env}" | grep "ETCD_CA_CERT" |  sed "s/^.*: '//" | sed "s/'$//")"
-
   create-etcd-certs "${REPLICA_NAME}" "${ETCD_CA_CERT}" "${ETCD_CA_KEY}"
 
   kube_env="$(echo "${kube_env}" | grep -v "ETCD_PEER_KEY")"
@@ -63,6 +62,7 @@ function replicate-master-instance() {
   get-metadata "${existing_master_zone}" "${existing_master_name}" gci-update-strategy > "${KUBE_TEMP}/gci-update.txt"
   get-metadata "${existing_master_zone}" "${existing_master_name}" gci-ensure-gke-docker > "${KUBE_TEMP}/gci-ensure-gke-docker.txt"
   get-metadata "${existing_master_zone}" "${existing_master_name}" gci-docker-version > "${KUBE_TEMP}/gci-docker-version.txt"
+  get-metadata "${existing_master_zone}" "${existing_master_name}" kube-master-certs > "${KUBE_TEMP}/kube-master-certs.yaml"
 
   create-master-instance-internal "${REPLICA_NAME}"
 }