diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index 4b8f323a863..ebe1e7b7398 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -66,6 +66,7 @@ EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS:-}" INSTANCE_PREFIX="${KUBE_AWS_INSTANCE_PREFIX:-kubernetes}" CLUSTER_ID=${INSTANCE_PREFIX} AWS_SSH_KEY=${AWS_SSH_KEY:-$HOME/.ssh/kube_aws_rsa} +CONFIG_CONTEXT="${KUBE_CONFIG_CONTEXT:-aws_${INSTANCE_PREFIX}}" IAM_PROFILE_MASTER="kubernetes-master" IAM_PROFILE_NODE="kubernetes-minion" diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh index 443060ca057..6c55f7edd66 100755 --- a/cluster/aws/config-test.sh +++ b/cluster/aws/config-test.sh @@ -52,6 +52,7 @@ DOCKER_STORAGE=${DOCKER_STORAGE:-aufs} EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS:-}" INSTANCE_PREFIX="${KUBE_AWS_INSTANCE_PREFIX:-e2e-test-${USER}}" +CONFIG_CONTEXT="${KUBE_CONFIG_CONTEXT:-aws_${INSTANCE_PREFIX}}" CLUSTER_ID=${INSTANCE_PREFIX} AWS_SSH_KEY=${AWS_SSH_KEY:-$HOME/.ssh/kube_aws_rsa} IAM_PROFILE_MASTER="kubernetes-master" diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh index 0c2c3fc1244..084e0841472 100755 --- a/cluster/aws/util.sh +++ b/cluster/aws/util.sh @@ -1224,7 +1224,7 @@ function build-config() { export KUBE_CERT="${CERT_DIR}/pki/issued/kubecfg.crt" export KUBE_KEY="${CERT_DIR}/pki/private/kubecfg.key" export CA_CERT="${CERT_DIR}/pki/ca.crt" - export CONTEXT="aws_${INSTANCE_PREFIX}" + export CONTEXT="${CONFIG_CONTEXT}" ( umask 077