Skip to content

K
k3s
Commit 4141679c authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #18748 from miry/compact-cloud-init-script-bug

Auto commit by PR queue bot
parents c59fad14 2272de1f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
cluster/aws/util.sh
View file @ 4141679c
...@@ -895,8 +895,9 @@ function start-master() { ...@@ -895,8 +895,9 @@ function start-master() {
# We're running right up against the 16KB limit # We're running right up against the 16KB limit
# Remove all comment lines and then put back the bin/bash shebang # 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" cat "${KUBE_TEMP}/master-user-data" | sed -e 's/^[[:blank:]]*#.*$//' | sed -e '/^[[:blank:]]*$/d' > "${KUBE_TEMP}/master-user-data.tmp"
sed -i '1i #! /bin/bash' "${KUBE_TEMP}/master-user-data" echo '#! /bin/bash' | cat - "${KUBE_TEMP}/master-user-data.tmp" > "${KUBE_TEMP}/master-user-data"
rm "${KUBE_TEMP}/master-user-data.tmp"
echo "Starting Master" echo "Starting Master"
master_id=$($AWS_CMD run-instances \ master_id=$($AWS_CMD run-instances \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment