github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-10 21:50:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #24910 from paralin/aws-configurable-context

Browse Source 
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:
k8s-merge-robot
2016-06-24 13:09:40 -07:00
committed by GitHub
parent e93608c859 1491e6c662
commit eeda4c7915
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/aws/util.sh
View File

@@ -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