From d8314b1b9bdc4e98c2322fd927198fc9d796143d Mon Sep 17 00:00:00 2001
From: Andy Zheng <qzheng@google.com>
Date: Mon, 9 May 2016 16:00:33 -0700
Subject: [PATCH] GCI/Trusty: Fix the running of kube-addon-manager

---
 cluster/gce/trusty/configure-helper.sh | 5 ++---
 cluster/gce/trusty/configure.sh        | 8 ++++----
 cluster/gce/trusty/master.yaml         | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/cluster/gce/trusty/configure-helper.sh b/cluster/gce/trusty/configure-helper.sh
index 1e2c9d4d19c..eca81f55118 100644
--- a/cluster/gce/trusty/configure-helper.sh
+++ b/cluster/gce/trusty/configure-helper.sh
@@ -590,8 +590,8 @@ setup_addon_manifests() {
   chmod 644 "${dst_dir}"/*
 }
 
-# Prepares the manifests of k8s addons static pods.
-prepare_kube_addons() {
+# Prepares the manifests of k8s addons, and starts the addon manager.
+start_kube_addons() {
   addon_src_dir="/home/kubernetes/kube-manifests/kubernetes/gci-trusty"
   addon_dst_dir="/etc/kubernetes/addons"
   # Set up manifests of other addons.
@@ -623,7 +623,6 @@ prepare_kube_addons() {
     sed -i -e "s@{{ *metrics_memory_per_node *}}@${metrics_memory_per_node}@g" "${controller_yaml}"
     sed -i -e "s@{{ *eventer_memory_per_node *}}@${eventer_memory_per_node}@g" "${controller_yaml}"
   fi
-  cp "${addon_src_dir}/namespace.yaml" "${addon_dst_dir}"
   if [ "${ENABLE_L7_LOADBALANCING:-}" = "glbc" ]; then
     setup_addon_manifests "addons" "cluster-loadbalancing/glbc"
   fi
diff --git a/cluster/gce/trusty/configure.sh b/cluster/gce/trusty/configure.sh
index 52b5acaabd1..4d3fdad8ab4 100644
--- a/cluster/gce/trusty/configure.sh
+++ b/cluster/gce/trusty/configure.sh
@@ -22,18 +22,18 @@
 
 download_kube_env() {
   # Fetch kube-env from GCE metadata server.
-  readonly tmp_install_dir="/var/cache/kubernetes-install"
-  mkdir -p "${tmp_install_dir}"
+  readonly tmp_kube_env="/tmp/kube-env.yaml"
   curl --fail --retry 5 --retry-delay 3 --silent --show-error \
     -H "X-Google-Metadata-Request: True" \
-    -o "${tmp_install_dir}/kube_env.yaml" \
+    -o "${tmp_kube_env}" \
     http://metadata.google.internal/computeMetadata/v1/instance/attributes/kube-env
   # Convert the yaml format file into a shell-style file.
   eval $(python -c '''
 import pipes,sys,yaml
 for k,v in yaml.load(sys.stdin).iteritems():
   print("readonly {var}={value}".format(var = k, value = pipes.quote(str(v))))
-''' < "${tmp_install_dir}/kube_env.yaml" > /etc/kube-env)
+''' < "${tmp_kube_env}" > /etc/kube-env)
+  rm -f "${tmp_kube_env}"
 }
 
 validate_hash() {
diff --git a/cluster/gce/trusty/master.yaml b/cluster/gce/trusty/master.yaml
index 5401951afca..b249b26894b 100644
--- a/cluster/gce/trusty/master.yaml
+++ b/cluster/gce/trusty/master.yaml
@@ -177,7 +177,7 @@ script
 	start_kube_apiserver
 	start_kube_controller_manager
 	start_kube_scheduler
-	prepare_kube_addons
+	start_kube_addons
 end script
 
 --====================================