scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17803 from davidsiefert/master

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-01 02:15:11 -08:00
parent 74049947d2 94d32588f4
commit bb86936765
1 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
cluster/aws/util.sh
View File

@@ -667,25 +667,7 @@ function assign-elastic-ip {
fi fi
} }
function ssh-key-setup {
function kube-up {
echo "Starting cluster using os distro: ${KUBE_OS_DISTRIBUTION}" >&2
get-tokens
detect-image
detect-minion-image
find-release-tars
ensure-temp-dir
upload-server-tars
ensure-iam-profiles
load-or-gen-kube-basicauth
if [[ ! -f "$AWS_SSH_KEY" ]]; then if [[ ! -f "$AWS_SSH_KEY" ]]; then
ssh-keygen -f "$AWS_SSH_KEY" -N '' ssh-keygen -f "$AWS_SSH_KEY" -N ''
fi fi
@@ -698,7 +680,9 @@ function kube-up {
AWS_SSH_KEY_NAME="kubernetes-${AWS_SSH_KEY_FINGERPRINT//:/}" AWS_SSH_KEY_NAME="kubernetes-${AWS_SSH_KEY_FINGERPRINT//:/}"
import-public-key ${AWS_SSH_KEY_NAME} ${AWS_SSH_KEY}.pub import-public-key ${AWS_SSH_KEY_NAME} ${AWS_SSH_KEY}.pub
}
function vpc-setup {
if [[ -z "${VPC_ID:-}" ]]; then if [[ -z "${VPC_ID:-}" ]]; then
VPC_ID=$(get_vpc_id) VPC_ID=$(get_vpc_id)
fi fi
@@ -712,9 +696,9 @@ function kube-up {
fi fi
echo "Using VPC $VPC_ID" echo "Using VPC $VPC_ID"
}
create-dhcp-option-set function subnet-setup {
if [[ -z "${SUBNET_ID:-}" ]]; then if [[ -z "${SUBNET_ID:-}" ]]; then
SUBNET_ID=$(get_subnet_id $VPC_ID $ZONE) SUBNET_ID=$(get_subnet_id $VPC_ID $ZONE)
fi fi
@@ -734,6 +718,33 @@ function kube-up {
fi fi
echo "Using subnet $SUBNET_ID" echo "Using subnet $SUBNET_ID"
}
function kube-up {
echo "Starting cluster using os distro: ${KUBE_OS_DISTRIBUTION}" >&2
get-tokens
detect-image
detect-minion-image
find-release-tars
ensure-temp-dir
upload-server-tars
ensure-iam-profiles
load-or-gen-kube-basicauth
ssh-key-setup
vpc-setup
create-dhcp-option-set
subnet-setup
IGW_ID=$(get_igw_id $VPC_ID) IGW_ID=$(get_igw_id $VPC_ID)
if [[ -z "$IGW_ID" ]]; then if [[ -z "$IGW_ID" ]]; then
@@ -804,12 +815,14 @@ function kube-up {
# Start minions # Start minions
start-minions start-minions
wait-minions
else else
# Create the master # Create the master
start-master start-master
# Start minions # Start minions
start-minions start-minions
wait-minions
# Wait for the master to be ready # Wait for the master to be ready
wait-master wait-master
@@ -1018,7 +1031,9 @@ function start-minions() {
--tags ResourceId=${ASG_NAME},ResourceType=auto-scaling-group,Key=Name,Value=${NODE_INSTANCE_PREFIX} \ --tags ResourceId=${ASG_NAME},ResourceType=auto-scaling-group,Key=Name,Value=${NODE_INSTANCE_PREFIX} \
ResourceId=${ASG_NAME},ResourceType=auto-scaling-group,Key=Role,Value=${NODE_TAG} \ ResourceId=${ASG_NAME},ResourceType=auto-scaling-group,Key=Role,Value=${NODE_TAG} \
ResourceId=${ASG_NAME},ResourceType=auto-scaling-group,Key=KubernetesCluster,Value=${CLUSTER_ID} ResourceId=${ASG_NAME},ResourceType=auto-scaling-group,Key=KubernetesCluster,Value=${CLUSTER_ID}
}
function wait-minions {
# Wait for the minions to be running # Wait for the minions to be running
# TODO(justinsb): This is really not needed any more # TODO(justinsb): This is really not needed any more
attempt=0 attempt=0