Skip to content

K
k3s
Commit 58783bc2 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #21684 from justinsb/fix_21200

Auto commit by PR queue bot
parents 7f1b6998 fb12c48c
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
cluster/aws/util.sh
View file @ 58783bc2
...@@ -1121,6 +1121,12 @@ function start-minions() { ...@@ -1121,6 +1121,12 @@ function start-minions() {
else else
public_ip_option="--no-associate-public-ip-address" public_ip_option="--no-associate-public-ip-address"
fi fi
local spot_price_option
if [[ -n "${NODE_SPOT_PRICE:-}" ]]; then
spot_price_option="--spot-price ${NODE_SPOT_PRICE}"
else
spot_price_option=""
fi
${AWS_ASG_CMD} create-launch-configuration \ ${AWS_ASG_CMD} create-launch-configuration \
--launch-configuration-name ${ASG_NAME} \ --launch-configuration-name ${ASG_NAME} \
--image-id $KUBE_NODE_IMAGE \ --image-id $KUBE_NODE_IMAGE \
...@@ -1129,6 +1135,7 @@ function start-minions() { ...@@ -1129,6 +1135,7 @@ function start-minions() {
--key-name ${AWS_SSH_KEY_NAME} \ --key-name ${AWS_SSH_KEY_NAME} \
--security-groups ${NODE_SG_ID} \ --security-groups ${NODE_SG_ID} \
${public_ip_option} \ ${public_ip_option} \
${spot_price_option} \
--block-device-mappings "${NODE_BLOCK_DEVICE_MAPPINGS}" \ --block-device-mappings "${NODE_BLOCK_DEVICE_MAPPINGS}" \
--user-data "fileb://${KUBE_TEMP}/node-user-data.gz" --user-data "fileb://${KUBE_TEMP}/node-user-data.gz"
......
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