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

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

Merge pull request #40719 from alindeman/kube-temp-exported
2dc1586f · Kubernetes Submit Queue · GitHub · 1a95922b · afb5e8ce · 2dc1586f
Commit 2dc1586f authored Feb 02, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

common.sh cluster/common.sh +1 -1

No files found.
--- a/cluster/common.sh
+++ b/cluster/common.sh
@@ -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
 }