github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40719 from alindeman/kube-temp-exported

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 39169, 40719, 38954, 40808, 40689)

Exports KUBE_TEMP for use in Vagrantfile

In #40147, the logic for setting `KUBE_TEMP` was refactored into `common.sh`. However, it was overlooked that `KUBE_TEMP` [needs to be exported for vagrant to work properly](https://github.com/kubernetes/kubernetes/pull/40147/files#diff-b19d3d93456020e2168c7f304f722969).

This PR restores the `export` so that `Vagrantfile` can use `ENV["KUBE_TEMP"]` properly.

👀 @rthallisey @shyamjvs @timothysc
This commit is contained in:
Kubernetes Submit Queue 2017-02-02 02:05:19 -08:00 committed by GitHub
commit 2dc1586f11
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/common.sh
View File

@ -314,7 +314,7 @@ function load-or-gen-kube-bearertoken() {
# KUBE_TEMP
function ensure-temp-dir {
if [[ -z ${KUBE_TEMP-} ]]; then
KUBE_TEMP=$(mktemp -d -t kubernetes.XXXXXX)
export KUBE_TEMP=$(mktemp -d -t kubernetes.XXXXXX)
trap 'rm -rf "${KUBE_TEMP}"' EXIT
fi
}