mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
Merge pull request #24910 from paralin/aws-configurable-context
Automatic merge from submit-queue cluster/aws: Add option for kubeconfig context Added KUBE_CONFIG_CONTEXT environment variable to customize the kubeconfig context created at the end of the aws kube-up script. Fixes #24877 This PR does barely anything and shouldn't require e2e tests. It's just a minor convenience. <!-- Reviewable:start --> --- This change is [<img src="http://reviewable.k8s.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](http://reviewable.k8s.io/reviews/kubernetes/kubernetes/24910) <!-- Reviewable:end -->
This commit is contained in:
commit
eeda4c7915
@ -66,6 +66,7 @@ EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS:-}"
|
|||||||
INSTANCE_PREFIX="${KUBE_AWS_INSTANCE_PREFIX:-kubernetes}"
|
INSTANCE_PREFIX="${KUBE_AWS_INSTANCE_PREFIX:-kubernetes}"
|
||||||
CLUSTER_ID=${INSTANCE_PREFIX}
|
CLUSTER_ID=${INSTANCE_PREFIX}
|
||||||
AWS_SSH_KEY=${AWS_SSH_KEY:-$HOME/.ssh/kube_aws_rsa}
|
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_MASTER="kubernetes-master"
|
||||||
IAM_PROFILE_NODE="kubernetes-minion"
|
IAM_PROFILE_NODE="kubernetes-minion"
|
||||||
|
|
||||||
|
@ -52,6 +52,7 @@ DOCKER_STORAGE=${DOCKER_STORAGE:-aufs}
|
|||||||
EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS:-}"
|
EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS:-}"
|
||||||
|
|
||||||
INSTANCE_PREFIX="${KUBE_AWS_INSTANCE_PREFIX:-e2e-test-${USER}}"
|
INSTANCE_PREFIX="${KUBE_AWS_INSTANCE_PREFIX:-e2e-test-${USER}}"
|
||||||
|
CONFIG_CONTEXT="${KUBE_CONFIG_CONTEXT:-aws_${INSTANCE_PREFIX}}"
|
||||||
CLUSTER_ID=${INSTANCE_PREFIX}
|
CLUSTER_ID=${INSTANCE_PREFIX}
|
||||||
AWS_SSH_KEY=${AWS_SSH_KEY:-$HOME/.ssh/kube_aws_rsa}
|
AWS_SSH_KEY=${AWS_SSH_KEY:-$HOME/.ssh/kube_aws_rsa}
|
||||||
IAM_PROFILE_MASTER="kubernetes-master"
|
IAM_PROFILE_MASTER="kubernetes-master"
|
||||||
|
@ -1224,7 +1224,7 @@ function build-config() {
|
|||||||
export KUBE_CERT="${CERT_DIR}/pki/issued/kubecfg.crt"
|
export KUBE_CERT="${CERT_DIR}/pki/issued/kubecfg.crt"
|
||||||
export KUBE_KEY="${CERT_DIR}/pki/private/kubecfg.key"
|
export KUBE_KEY="${CERT_DIR}/pki/private/kubecfg.key"
|
||||||
export CA_CERT="${CERT_DIR}/pki/ca.crt"
|
export CA_CERT="${CERT_DIR}/pki/ca.crt"
|
||||||
export CONTEXT="aws_${INSTANCE_PREFIX}"
|
export CONTEXT="${CONFIG_CONTEXT}"
|
||||||
(
|
(
|
||||||
umask 077
|
umask 077
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user