From dbb92f98366c8a61c4236b90c2505fa026069fd7 Mon Sep 17 00:00:00 2001
From: Ryan Hallisey <rhallise@redhat.com>
Date: Thu, 19 Jan 2017 09:30:50 -0500
Subject: [PATCH] Use ensure-temp-dir in the common.sh script

Instead of having an ensure-temp-dir function in multiple
places, add it to the common.sh script which is sourced by
all the providers.
---
 cluster/aws/util.sh               | 12 ------------
 cluster/azure-legacy/util.sh      | 11 -----------
 cluster/common.sh                 | 11 +++++++++++
 cluster/gce/util.sh               | 11 -----------
 cluster/photon-controller/util.sh | 12 ------------
 cluster/vagrant/util.sh           | 11 -----------
 6 files changed, 11 insertions(+), 57 deletions(-)

diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh
index 6a6d36c6622..7529b21445d 100755
--- a/cluster/aws/util.sh
+++ b/cluster/aws/util.sh
@@ -570,18 +570,6 @@ function verify-prereqs {
   fi
 }
 
-
-# Create a temp dir that'll be deleted at the end of this bash session.
-#
-# Vars set:
-#   KUBE_TEMP
-function ensure-temp-dir {
-  if [[ -z ${KUBE_TEMP-} ]]; then
-    KUBE_TEMP=$(mktemp -d -t kubernetes.XXXXXX)
-    trap 'rm -rf "${KUBE_TEMP}"' EXIT
-  fi
-}
-
 # Take the local tar files and upload them to S3.  They will then be
 # downloaded by the master as part of the start up script for the master.
 #
diff --git a/cluster/azure-legacy/util.sh b/cluster/azure-legacy/util.sh
index b2c7c434e1b..d71fababe86 100644
--- a/cluster/azure-legacy/util.sh
+++ b/cluster/azure-legacy/util.sh
@@ -100,17 +100,6 @@ function verify-prereqs {
     echo "==> CONTAINER: $CONTAINER"
 }
 
-# Create a temp dir that'll be deleted at the end of this bash session.
-#
-# Vars set:
-#   KUBE_TEMP
-function ensure-temp-dir {
-    if [[ -z ${KUBE_TEMP-} ]]; then
-        KUBE_TEMP=$(mktemp -d -t kubernetes.XXXXXX)
-        trap 'rm -rf "${KUBE_TEMP}"' EXIT
-    fi
-}
-
 # Take the local tar files and upload them to Azure Storage.  They will then be
 # downloaded by the master as part of the start up script for the master.
 #
diff --git a/cluster/common.sh b/cluster/common.sh
index 865f23f74e0..0e7654acf84 100755
--- a/cluster/common.sh
+++ b/cluster/common.sh
@@ -308,6 +308,17 @@ function load-or-gen-kube-bearertoken() {
   fi
 }
 
+# Create a temp dir that'll be deleted at the end of this bash session.
+#
+# Vars set:
+#   KUBE_TEMP
+function ensure-temp-dir {
+  if [[ -z ${KUBE_TEMP-} ]]; then
+    KUBE_TEMP=$(mktemp -d -t kubernetes.XXXXXX)
+    trap 'rm -rf "${KUBE_TEMP}"' EXIT
+  fi
+}
+
 # Get the master IP for the current-context in kubeconfig if one exists.
 #
 # Assumed vars:
diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index 8688f50c6d5..fe119957cd1 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -116,17 +116,6 @@ function verify-prereqs() {
   update-or-verify-gcloud
 }
 
-# Create a temp dir that'll be deleted at the end of this bash session.
-#
-# Vars set:
-#   KUBE_TEMP
-function ensure-temp-dir() {
-  if [[ -z ${KUBE_TEMP-} ]]; then
-    KUBE_TEMP=$(mktemp -d -t kubernetes.XXXXXX)
-    trap 'rm -rf "${KUBE_TEMP}"' EXIT
-  fi
-}
-
 # Use the gcloud defaults to find the project.  If it is already set in the
 # environment then go with that.
 #
diff --git a/cluster/photon-controller/util.sh b/cluster/photon-controller/util.sh
index a6e769f71ff..bc9d0b572a9 100755
--- a/cluster/photon-controller/util.sh
+++ b/cluster/photon-controller/util.sh
@@ -1030,18 +1030,6 @@ function verify-cmd-in-path {
   }
 }
 
-#
-# Checks that KUBE_TEMP is set, or sets it
-# If it sets it, it also creates the temporary directory
-# and sets up a trap so that we delete it when we exit
-#
-function ensure-temp-dir {
-  if [[ -z ${KUBE_TEMP-} ]]; then
-    KUBE_TEMP=$(mktemp -d -t kubernetes.XXXXXX)
-    trap-add "rm -rf '${KUBE_TEMP}'" EXIT
-  fi
-}
-
 #
 # Repeatedly try a command over ssh until it succeeds or until five minutes have passed
 # The timeout isn't exact, since we assume the command runs instantaneously, and
diff --git a/cluster/vagrant/util.sh b/cluster/vagrant/util.sh
index 23255f79d6d..0b4be7fd840 100755
--- a/cluster/vagrant/util.sh
+++ b/cluster/vagrant/util.sh
@@ -104,17 +104,6 @@ function verify-prereqs {
   export USING_KUBE_SCRIPTS=true
 }
 
-# Create a temp dir that'll be deleted at the end of this bash session.
-#
-# Vars set:
-#   KUBE_TEMP
-function ensure-temp-dir {
-  if [[ -z ${KUBE_TEMP-} ]]; then
-    export KUBE_TEMP=$(mktemp -d -t kubernetes.XXXXXX)
-    trap 'rm -rf "${KUBE_TEMP}"' EXIT
-  fi
-}
-
 # Create a set of provision scripts for the master and each of the nodes
 function create-provision-scripts {
   ensure-temp-dir