From 2e5be7c4e59ce630d1cd72ad19ac3b407cccc7b3 Mon Sep 17 00:00:00 2001
From: Joe Beda <joe.github@bedafamily.com>
Date: Fri, 6 Jun 2014 22:26:39 -0700
Subject: [PATCH] Minimize metadata when creating startup scripts.

Strip all comments when creating the omnibus startup scripts for starting the VMs.  This reduces some noise and may prevent us from hitting the eventual limits there.
---
 cluster/kube-push.sh | 2 +-
 cluster/kube-up.sh   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cluster/kube-push.sh b/cluster/kube-push.sh
index c2a5ae8cb2a..28ad9ce4af7 100755
--- a/cluster/kube-push.sh
+++ b/cluster/kube-push.sh
@@ -42,7 +42,7 @@ detect-master
 
 (
   echo MASTER_RELEASE_TAR=$RELEASE_NORMALIZED/master-release.tgz
-  cat $(dirname $0)/templates/download-release.sh
+  grep -v "^#" $(dirname $0)/templates/download-release.sh
   echo "echo Executing configuration"
   echo "sudo salt '*' mine.update"
   echo "sudo salt --force-color '*' state.highstate"
diff --git a/cluster/kube-up.sh b/cluster/kube-up.sh
index 4f7e7fdb57b..34770379586 100755
--- a/cluster/kube-up.sh
+++ b/cluster/kube-up.sh
@@ -62,8 +62,8 @@ HTPASSWD=$(cat ${KUBE_TEMP}/htpasswd)
   echo "MASTER_NAME=${MASTER_NAME}"
   echo "MASTER_RELEASE_TAR=${RELEASE_NORMALIZED}/master-release.tgz"
   echo "MASTER_HTPASSWD='${HTPASSWD}'"
-  cat $(dirname $0)/templates/download-release.sh
-  cat $(dirname $0)/templates/salt-master.sh
+  grep -v "^#" $(dirname $0)/templates/download-release.sh
+  grep -v "^#" $(dirname $0)/templates/salt-master.sh
 ) > ${KUBE_TEMP}/master-start.sh
 
 echo "Starting VMs and configuring firewalls"
@@ -86,7 +86,7 @@ for (( i=0; i<${#MINION_NAMES[@]}; i++)); do
     echo "#! /bin/bash"
     echo "MASTER_NAME=${MASTER_NAME}"
     echo "MINION_IP_RANGE=${MINION_IP_RANGES[$i]}"
-    cat $(dirname $0)/templates/salt-minion.sh
+    grep -v "^#" $(dirname $0)/templates/salt-minion.sh
   ) > ${KUBE_TEMP}/minion-start-${i}.sh
 
   gcloud compute instances create ${MINION_NAMES[$i]} \