github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14 from jbeda/metadata-min 

Minimize metadata when creating startup scripts.
pull/6/head
brendandburns 2014-06-07 21:47:12 -07:00
parent a47fe47048 2e5be7c4e5
commit 9541867cee
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/kube-push.sh
View File

@ -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"

6
cluster/kube-up.sh
View File

@ -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]} \