Merge pull request #38727 from Amey-D/gci-metadata-eof

Automatic merge from submit-queue Ensure the GCI metadata files do not have newline at the end Fixes #36708 @dchen1107 @Random-Liu can one of you help with the review? cc @kubernetes/goog-image FYI

Merge pull request #38727 from Amey-D/gci-metadata-eof
f826e11c · Kubernetes Submit Queue · GitHub · aca523f5 · 5ec42e6a · f826e11c
Commit f826e11c authored Dec 13, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 13, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 9 deletions

helper.sh cluster/gce/gci/helper.sh +3 -9

No files found.
--- a/cluster/gce/gci/helper.sh
+++ b/cluster/gce/gci/helper.sh
@@ -21,18 +21,12 @@
 #   KUBE_TEMP
 function ensure-gci-metadata-files {
  if [[ ! -f "${KUBE_TEMP}/gci-update.txt" ]]; then
-    cat >"${KUBE_TEMP}/gci-update.txt" << EOF
+    echo -n "update_disabled" > "${KUBE_TEMP}/gci-update.txt"
-update_disabled
-EOF
  fi
  if [[ ! -f "${KUBE_TEMP}/gci-ensure-gke-docker.txt" ]]; then
-    cat >"${KUBE_TEMP}/gci-ensure-gke-docker.txt" << EOF
+    echo -n "true" > "${KUBE_TEMP}/gci-ensure-gke-docker.txt"
-true
-EOF
  fi
  if [[ ! -f "${KUBE_TEMP}/gci-docker-version.txt" ]]; then
-    cat >"${KUBE_TEMP}/gci-docker-version.txt" << EOF
+    echo -n "${GCI_DOCKER_VERSION:-}" > "${KUBE_TEMP}/gci-docker-version.txt"
-${GCI_DOCKER_VERSION:-}
-EOF
  fi
 }