github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17091 from justinsb/aws_strip_comments

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-09 21:39:32 -08:00
commit d8cd5fa3bd
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cluster/aws/util.sh
View File

@ -891,7 +891,12 @@ function start-master() {
grep -v "^#" "${KUBE_ROOT}/cluster/aws/templates/create-dynamic-salt-files.sh" grep -v "^#" "${KUBE_ROOT}/cluster/aws/templates/create-dynamic-salt-files.sh"
grep -v "^#" "${KUBE_ROOT}/cluster/aws/templates/download-release.sh" grep -v "^#" "${KUBE_ROOT}/cluster/aws/templates/download-release.sh"
grep -v "^#" "${KUBE_ROOT}/cluster/aws/templates/salt-master.sh" grep -v "^#" "${KUBE_ROOT}/cluster/aws/templates/salt-master.sh"
) > "${KUBE_TEMP}/master-start.sh" ) > "${KUBE_TEMP}/master-user-data"
# We're running right up against the 16KB limit
# Remove all comment lines and then put back the bin/bash shebang
sed -i -e 's/^[[:blank:]]*#.*$//' -e '/^[[:blank:]]*$/d' "${KUBE_TEMP}/master-user-data"
sed -i '1i #! /bin/bash' "${KUBE_TEMP}/master-user-data"
echo "Starting Master" echo "Starting Master"
master_id=$($AWS_CMD run-instances \ master_id=$($AWS_CMD run-instances \
@ -904,7 +909,7 @@ function start-master() {
--security-group-ids ${MASTER_SG_ID} \ --security-group-ids ${MASTER_SG_ID} \
--associate-public-ip-address \ --associate-public-ip-address \
--block-device-mappings "${MASTER_BLOCK_DEVICE_MAPPINGS}" \ --block-device-mappings "${MASTER_BLOCK_DEVICE_MAPPINGS}" \
--user-data file://${KUBE_TEMP}/master-start.sh \ --user-data file://${KUBE_TEMP}/master-user-data \
--query Instances[].InstanceId) --query Instances[].InstanceId)
add-tag $master_id Name $MASTER_NAME add-tag $master_id Name $MASTER_NAME
add-tag $master_id Role $MASTER_TAG add-tag $master_id Role $MASTER_TAG