Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AWS: Strip more comments from instance user-data #17091

Merged
merged 1 commit into from
Dec 10, 2015
Merged

AWS: Strip more comments from instance user-data #17091

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions cluster/aws/util.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/download-release.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"
master_id=$($AWS_CMD run-instances \
Expand All @@ -904,7 +909,7 @@ function start-master() {
--security-group-ids ${MASTER_SG_ID} \
--associate-public-ip-address \
--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)
add-tag $master_id Name $MASTER_NAME
add-tag $master_id Role $MASTER_TAG
Expand Down