From 869ea6b0c809ae397cc626074ec76af65e41f6f3 Mon Sep 17 00:00:00 2001
From: Lantao Liu <lantaol@google.com>
Date: Thu, 14 Dec 2017 01:53:46 +0000
Subject: [PATCH] Add document for kube-up.sh

Signed-off-by: Lantao Liu <lantaol@google.com>
---
 contrib/gce/configure.sh |  2 +-
 contrib/{ => gce}/env    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename contrib/{ => gce}/env (61%)

diff --git a/contrib/gce/configure.sh b/contrib/gce/configure.sh
index a72bca9a8..a648d2995 100755
--- a/contrib/gce/configure.sh
+++ b/contrib/gce/configure.sh
@@ -30,7 +30,7 @@ fetch_metadata() {
   local -r key=$1
   local -r attributes="http://metadata.google.internal/computeMetadata/v1/instance/attributes"
   if curl --fail --retry 5 --retry-delay 3 --silent --show-error -H "X-Google-Metadata-Request: True" "${attributes}/" | \
-    grep -q "${key}"; then
+    grep -q "^${key}$"; then
     curl --fail --retry 5 --retry-delay 3 --silent --show-error -H "X-Google-Metadata-Request: True" \
       "${attributes}/${key}"
   fi
diff --git a/contrib/env b/contrib/gce/env
similarity index 61%
rename from contrib/env
rename to contrib/gce/env
index ce6fad9af..1d111864d 100644
--- a/contrib/env
+++ b/contrib/gce/env
@@ -1,13 +1,13 @@
 #!/bin/bash
-CLUSTER_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+GCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # TODO(random-liu): Upload release tarball to user's own GCS, and use it. We should
 # not let all nodes of all users download tarball from cri-containerd-release.
-export KUBE_MASTER_EXTRA_METADATA="user-data=${CLUSTER_DIR}/gce/cloud-init/master.yaml,cri-containerd-configure-sh=${CLUSTER_DIR}/gce/configure.sh"
-export KUBE_NODE_EXTRA_METADATA="user-data=${CLUSTER_DIR}/gce/cloud-init/node.yaml,cri-containerd-configure-sh=${CLUSTER_DIR}/gce/configure.sh"
-if [ -n "${VERSION}" ]; then
+export KUBE_MASTER_EXTRA_METADATA="user-data=${GCE_DIR}/cloud-init/master.yaml,cri-containerd-configure-sh=${GCE_DIR}/configure.sh"
+export KUBE_NODE_EXTRA_METADATA="user-data=${GCE_DIR}/cloud-init/node.yaml,cri-containerd-configure-sh=${GCE_DIR}/configure.sh"
+if [ -n "${CRI_CONTAINERD_VERSION}" ]; then
   version=$(mktemp /tmp/version.XXXX)
-  echo "${VERSION}" > "$version"
+  echo "${CRI_CONTAINERD_VERSION}" > "$version"
   export KUBE_MASTER_EXTRA_METADATA="${KUBE_MASTER_EXTRA_METADATA},version=${version}"
   export KUBE_NODE_EXTRA_METADATA="${KUBE_NODE_EXTRA_METADATA},version=${version}"
 fi