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

Minion->Node rename: KUBE_NODE_IMAGE

pull/6/head
Brad Erickson 2015-11-23 19:00:37 -08:00
parent 6b91b45eff
commit 68539ae8a4
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/aws/config-default.sh
View File

@ -134,7 +134,7 @@ ENABLE_MINION_PUBLIC_IP=${KUBE_ENABLE_NODE_PUBLIC_IP:-true}
# OS options for minions # OS options for minions
KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-vivid}" KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-vivid}"
KUBE_MINION_IMAGE="${KUBE_MINION_IMAGE:-}" KUBE_NODE_IMAGE="${KUBE_NODE_IMAGE:-}"
COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}" COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}"
CONTAINER_RUNTIME="${KUBE_CONTAINER_RUNTIME:-docker}" CONTAINER_RUNTIME="${KUBE_CONTAINER_RUNTIME:-docker}"
RKT_VERSION="${KUBE_RKT_VERSION:-0.5.5}" RKT_VERSION="${KUBE_RKT_VERSION:-0.5.5}"

2
cluster/aws/config-test.sh
View File

@ -130,7 +130,7 @@ ENABLE_MINION_PUBLIC_IP=${KUBE_ENABLE_NODE_PUBLIC_IP:-true}
# OS options for minions # OS options for minions
KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-vivid}" KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-vivid}"
KUBE_MINION_IMAGE="${KUBE_MINION_IMAGE:-}" KUBE_NODE_IMAGE="${KUBE_NODE_IMAGE:-}"
COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}" COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}"
CONTAINER_RUNTIME="${KUBE_CONTAINER_RUNTIME:-docker}" CONTAINER_RUNTIME="${KUBE_CONTAINER_RUNTIME:-docker}"
RKT_VERSION="${KUBE_RKT_VERSION:-0.5.5}" RKT_VERSION="${KUBE_RKT_VERSION:-0.5.5}"

8
cluster/aws/coreos/util.sh
View File

@ -19,11 +19,11 @@
SSH_USER=core SSH_USER=core
function detect-minion-image (){ function detect-minion-image (){
if [[ -z "${KUBE_MINION_IMAGE-}" ]]; then if [[ -z "${KUBE_NODE_IMAGE-}" ]]; then
KUBE_MINION_IMAGE=$(curl -s -L http://${COREOS_CHANNEL}.release.core-os.net/amd64-usr/current/coreos_production_ami_all.json | python -c "import json,sys;obj=json.load(sys.stdin);print filter(lambda t: t['name']=='${AWS_REGION}', obj['amis'])[0]['hvm']") KUBE_NODE_IMAGE=$(curl -s -L http://${COREOS_CHANNEL}.release.core-os.net/amd64-usr/current/coreos_production_ami_all.json | python -c "import json,sys;obj=json.load(sys.stdin);print filter(lambda t: t['name']=='${AWS_REGION}', obj['amis'])[0]['hvm']")
fi fi
if [[ -z "${KUBE_MINION_IMAGE-}" ]]; then if [[ -z "${KUBE_NODE_IMAGE-}" ]]; then
echo "unable to determine KUBE_MINION_IMAGE" echo "unable to determine KUBE_NODE_IMAGE"
exit 2 exit 2
fi fi
} }

4
cluster/aws/trusty/common.sh
View File

@ -18,9 +18,9 @@
# A library of common helper functions for Ubuntus & Debians. # A library of common helper functions for Ubuntus & Debians.
function detect-minion-image() { function detect-minion-image() {
if [[ -z "${KUBE_MINION_IMAGE=-}" ]]; then if [[ -z "${KUBE_NODE_IMAGE=-}" ]]; then
detect-image detect-image
KUBE_MINION_IMAGE=$AWS_IMAGE KUBE_NODE_IMAGE=$AWS_IMAGE
fi fi
} }

2
cluster/aws/util.sh
View File

@ -997,7 +997,7 @@ function start-minions() {
fi 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_MINION_IMAGE \ --image-id $KUBE_NODE_IMAGE \
--iam-instance-profile ${IAM_PROFILE_NODE} \ --iam-instance-profile ${IAM_PROFILE_NODE} \
--instance-type $MINION_SIZE \ --instance-type $MINION_SIZE \
--key-name ${AWS_SSH_KEY_NAME} \ --key-name ${AWS_SSH_KEY_NAME} \