github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-11 21:12:07 +00:00
Code Issues Projects Releases Wiki Activity

Update aws.

Browse Source
This commit is contained in:
Brendan Burns 2014-12-19 13:49:54 -08:00
parent bd712b61e6
commit 2369f0d50d
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/aws/templates/salt-master.sh
View File

@ -27,7 +27,7 @@ EOF
cat <<EOF > /etc/aws.conf cat <<EOF > /etc/aws.conf
[Global] [Global]
Region:${AWS_ZONE} Region = ${AWS_ZONE}
EOF EOF
# Auto accept all keys from minions that try to join # Auto accept all keys from minions that try to join

9
cluster/aws/util.sh
View File

@ -228,6 +228,11 @@ function kube-up {
ssh-keygen -f $AWS_SSH_KEY -N '' ssh-keygen -f $AWS_SSH_KEY -N ''
fi fi
aws iam get-instance-profile --instance-profile-name ${IAM_PROFILE} || {
echo "You need to set up an IAM profile and role for kubernetes"
exit 1
}
$AWS_CMD import-key-pair --key-name kubernetes --public-key-material file://$AWS_SSH_KEY.pub > $LOG 2>&1 || true $AWS_CMD import-key-pair --key-name kubernetes --public-key-material file://$AWS_SSH_KEY.pub > $LOG 2>&1 || true
VPC_ID=$($AWS_CMD describe-vpcs | get_vpc_id) VPC_ID=$($AWS_CMD describe-vpcs | get_vpc_id)
@ -285,8 +290,8 @@ function kube-up {
echo "cd /var/cache/kubernetes-install" echo "cd /var/cache/kubernetes-install"
echo "readonly MASTER_NAME='${MASTER_NAME}'" echo "readonly MASTER_NAME='${MASTER_NAME}'"
echo "readonly NODE_INSTANCE_PREFIX='${INSTANCE_PREFIX}-minion'" echo "readonly NODE_INSTANCE_PREFIX='${INSTANCE_PREFIX}-minion'"
echo "readonly SERVER_BINARY_TAR_URL='https://s3.amazonaws.com/${SERVER_BINARY_TAR_URL}'" echo "readonly SERVER_BINARY_TAR_URL='https://s3-${ZONE}.amazonaws.com/${SERVER_BINARY_TAR_URL}'"
echo "readonly SALT_TAR_URL='https://s3.amazonaws.com/${SALT_TAR_URL}'" echo "readonly SALT_TAR_URL='https://s3-${ZONE}.amazonaws.com/${SALT_TAR_URL}'"
echo "readonly AWS_ZONE='${ZONE}'" echo "readonly AWS_ZONE='${ZONE}'"
echo "readonly MASTER_HTPASSWD='${htpasswd}'" echo "readonly MASTER_HTPASSWD='${htpasswd}'"
echo "readonly PORTAL_NET='${PORTAL_NET}'" echo "readonly PORTAL_NET='${PORTAL_NET}'"

6
cluster/saltbase/salt/kube-controller-manager/default
View File

@ -46,8 +46,4 @@
{% endif -%} {% endif -%}
{% endif -%} {% endif -%}
<<<<<<< HEAD DAEMON_ARGS="{{daemon_args}} {{master}} {{machines}} {{ minion_regexp }} {{ cloud_provider }} {{ cloud_config }} {{pillar['log_level']}}"
DAEMON_ARGS="{{daemon_args}} {{master}} {{machines}} {{ minion_regexp }} {{ cloud_provider }} {{pillar['log_level']}}"
=======
DAEMON_ARGS="{{daemon_args}} {{master}} {{machines}} {{ minion_regexp }} {{ cloud_provider }} {{ cloud_config }}"
>>>>>>> 83f3982eee4d36962919d4f55a41ec1c2111d01a