From ee913b1273ebf7f4f346873321e056c90cb8bbd7 Mon Sep 17 00:00:00 2001
From: Andy Zheng <qzheng@google.com>
Date: Tue, 18 Aug 2015 18:42:40 -0700
Subject: [PATCH] Use yaml format for trusty node kube-env

It uses the same function as Debian to create the yaml format
node kube-env file.
---
 cluster/gce/trusty/helper.sh | 122 ++---------------------------------
 cluster/gce/trusty/node.yaml |  10 ++-
 2 files changed, 12 insertions(+), 120 deletions(-)

diff --git a/cluster/gce/trusty/helper.sh b/cluster/gce/trusty/helper.sh
index 6ad5f79c727..09aa4b12dc8 100644
--- a/cluster/gce/trusty/helper.sh
+++ b/cluster/gce/trusty/helper.sh
@@ -22,124 +22,10 @@
 # replaced upstart with systemd as the init system. Consequently, the
 # configuration cannot work on these images.
 
-# $1: if 'true', we're building a master yaml, else a node
-function build-kube-env {
-  local master=$1
-  local file=$2
-
-  rm -f ${file}
-  # TODO(andyzheng0831): master node is still running with Debian image. Switch it
-  # to Ubuntu trusty.
-  if [[ "${master}" == "true" ]]; then
-  cat >$file <<EOF
-KUBERNETES_MASTER: "true"
-ENV_TIMESTAMP: $(yaml-quote $(date -u +%Y-%m-%dT%T%z))
-INSTANCE_PREFIX: $(yaml-quote ${INSTANCE_PREFIX})
-NODE_INSTANCE_PREFIX: $(yaml-quote ${NODE_INSTANCE_PREFIX})
-CLUSTER_IP_RANGE: $(yaml-quote ${CLUSTER_IP_RANGE:-10.244.0.0/16})
-SERVER_BINARY_TAR_URL: $(yaml-quote ${SERVER_BINARY_TAR_URL})
-SERVER_BINARY_TAR_HASH: $(yaml-quote ${SERVER_BINARY_TAR_HASH})
-SALT_TAR_URL: $(yaml-quote ${SALT_TAR_URL})
-SALT_TAR_HASH: $(yaml-quote ${SALT_TAR_HASH})
-SERVICE_CLUSTER_IP_RANGE: $(yaml-quote ${SERVICE_CLUSTER_IP_RANGE})
-ALLOCATE_NODE_CIDRS: $(yaml-quote ${ALLOCATE_NODE_CIDRS:-false})
-ENABLE_CLUSTER_MONITORING: $(yaml-quote ${ENABLE_CLUSTER_MONITORING:-none})
-ENABLE_NODE_MONITORING: $(yaml-quote ${ENABLE_NODE_MONITORING:-false})
-ENABLE_CLUSTER_LOGGING: $(yaml-quote ${ENABLE_CLUSTER_LOGGING:-false})
-ENABLE_CLUSTER_UI: $(yaml-quote ${ENABLE_CLUSTER_UI:-false})
-ENABLE_NODE_LOGGING: $(yaml-quote ${ENABLE_NODE_LOGGING:-false})
-LOGGING_DESTINATION: $(yaml-quote ${LOGGING_DESTINATION:-})
-ELASTICSEARCH_LOGGING_REPLICAS: $(yaml-quote ${ELASTICSEARCH_LOGGING_REPLICAS:-})
-ENABLE_CLUSTER_DNS: $(yaml-quote ${ENABLE_CLUSTER_DNS:-false})
-DNS_REPLICAS: $(yaml-quote ${DNS_REPLICAS:-})
-DNS_SERVER_IP: $(yaml-quote ${DNS_SERVER_IP:-})
-DNS_DOMAIN: $(yaml-quote ${DNS_DOMAIN:-})
-KUBE_USER: $(yaml-quote ${KUBE_USER})
-KUBE_PASSWORD: $(yaml-quote ${KUBE_PASSWORD})
-KUBE_BEARER_TOKEN: $(yaml-quote ${KUBE_BEARER_TOKEN})
-KUBELET_TOKEN: $(yaml-quote ${KUBELET_TOKEN:-})
-KUBE_PROXY_TOKEN: $(yaml-quote ${KUBE_PROXY_TOKEN:-})
-ADMISSION_CONTROL: $(yaml-quote ${ADMISSION_CONTROL:-})
-MASTER_IP_RANGE: $(yaml-quote ${MASTER_IP_RANGE})
-KUBERNETES_MASTER_NAME: $(yaml-quote ${MASTER_NAME})
-KUBERNETES_CONTAINER_RUNTIME: $(yaml-quote ${CONTAINER_RUNTIME})
-RKT_VERSION: $(yaml-quote ${RKT_VERSION})
-CA_CERT: $(yaml-quote ${CA_CERT_BASE64})
-MASTER_CERT: $(yaml-quote ${MASTER_CERT_BASE64:-})
-MASTER_KEY: $(yaml-quote ${MASTER_KEY_BASE64:-})
-KUBECFG_CERT: $(yaml-quote ${KUBECFG_CERT_BASE64:-})
-KUBECFG_KEY: $(yaml-quote ${KUBECFG_KEY_BASE64:-})
-EOF
-  else
-    cat >>$file <<EOF
-ENV_TIMESTAMP="$(date -u +%Y-%m-%dT%T%z)"
-INSTANCE_PREFIX=${INSTANCE_PREFIX}
-NODE_INSTANCE_PREFIX=${NODE_INSTANCE_PREFIX}
-SERVER_BINARY_TAR_URL=${SERVER_BINARY_TAR_URL}
-SERVER_BINARY_TAR_HASH=${SERVER_BINARY_TAR_HASH}
-SALT_TAR_URL=${SALT_TAR_URL}
-SALT_TAR_HASH=${SALT_TAR_HASH}
-SERVICE_CLUSTER_IP_RANGE=${SERVICE_CLUSTER_IP_RANGE}
-ENABLE_CLUSTER_MONITORING=${ENABLE_CLUSTER_MONITORING:-none}
-ENABLE_NODE_MONITORING=${ENABLE_NODE_MONITORING:-false}
-ENABLE_CLUSTER_LOGGING=${ENABLE_CLUSTER_LOGGING:-false}
-ENABLE_NODE_LOGGING=${ENABLE_NODE_LOGGING:-false}
-LOGGING_DESTINATION=${LOGGING_DESTINATION:-}
-ELASTICSEARCH_LOGGING_REPLICAS=${ELASTICSEARCH_LOGGING_REPLICAS:-}
-ENABLE_CLUSTER_DNS=${ENABLE_CLUSTER_DNS:-false}
-DNS_REPLICAS=${DNS_REPLICAS:-}
-DNS_SERVER_IP=${DNS_SERVER_IP:-}
-DNS_DOMAIN=${DNS_DOMAIN:-}
-KUBELET_TOKEN=${KUBELET_TOKEN:-}
-KUBE_PROXY_TOKEN=${KUBE_PROXY_TOKEN:-}
-ADMISSION_CONTROL=${ADMISSION_CONTROL:-}
-MASTER_IP_RANGE=${MASTER_IP_RANGE}
-KUBERNETES_MASTER_NAME=${MASTER_NAME}
-ZONE=${ZONE}
-EXTRA_DOCKER_OPTS=${EXTRA_DOCKER_OPTS:-}
-PROJECT_ID=${PROJECT}
-CA_CERT=${CA_CERT_BASE64}
-KUBELET_CERT=${KUBELET_CERT_BASE64:-}
-KUBELET_KEY=${KUBELET_KEY_BASE64:-}
-EOF
-  fi
-}
-
-# create-master-instance creates the master instance. If called with
-# an argument, the argument is used as the name to a reserved IP
-# address for the master. (In the case of upgrade/repair, we re-use
-# the same IP.)
-#
-# It requires a whole slew of assumed variables, partially due to to
-# the call to write-master-env. Listing them would be rather
-# futile. Instead, we list the required calls to ensure any additional
-# variables are set:
-#   ensure-temp-dir
-#   detect-project
-#   get-bearer-token
-#
-# TODO(andyzheng0831): We are still running master on Debian.
-# Convert master node to use Ubuntu trusty image too.
-function create-master-instance {
-  local address_opt=""
-  [[ -n ${1:-} ]] && address_opt="--address ${1}"
-
-  write-master-env
-  gcloud compute instances create "${MASTER_NAME}" \
-    ${address_opt} \
-    --project "${PROJECT}" \
-    --zone "${ZONE}" \
-    --machine-type "${MASTER_SIZE}" \
-    --image-project="${MASTER_IMAGE_PROJECT}" \
-    --image "${MASTER_IMAGE}" \
-    --tags "${MASTER_TAG}" \
-    --network "${NETWORK}" \
-    --scopes "storage-ro,compute-rw" \
-    --can-ip-forward \
-    --metadata-from-file \
-      "startup-script=${KUBE_ROOT}/cluster/gce/configure-vm.sh,kube-env=${KUBE_TEMP}/master-kube-env.yaml" \
-    --disk "name=${MASTER_NAME}-pd,device-name=master-pd,mode=rw,boot=no,auto-delete=no"
-}
+# By sourcing debian's helper.sh, we use the same build-kube-env and
+# create-master-instance functions as debian. But we overwrite the
+# create-node-instance-template function to use Ubuntu.
+source "${KUBE_ROOT}/cluster/gce/debian/helper.sh"
 
 # TODO(andyzheng0831): Make $1 required.
 # TODO(andyzheng0831): Document required vars (for this and call chain).
diff --git a/cluster/gce/trusty/node.yaml b/cluster/gce/trusty/node.yaml
index 167060ee9a7..925ecf4c038 100644
--- a/cluster/gce/trusty/node.yaml
+++ b/cluster/gce/trusty/node.yaml
@@ -38,10 +38,16 @@ script
 	# Fetch kube-env from GCE metadata server.
 	curl --fail --silent --show-error \
 		-H "X-Google-Metadata-Request: True" \
-		-o /etc/kube-env \
+		-o /tmp/kube-env-yaml \
 		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/kube-env-yaml > /etc/kube-env)
 
-	# Create the kubelet kubeconfig file.
+	 #Create the kubelet kubeconfig file.
 	. /etc/kube-env
 	if [ -z "${KUBELET_CA_CERT}" ]; then
 		KUBELET_CA_CERT="${CA_CERT}"