From 49faff32da0de5a185bc66b1f3b23f74651c65f1 Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Fri, 28 Apr 2017 15:04:28 -0400
Subject: [PATCH] Support running StatefulSetBasic e2e tests with
 local-up-cluster

Currently StatefulSet(s) fail when you use local-up-cluster without
setting a cloud provider. In this PR, we use set the
kubernetes.io/host-path provisioner as the default provisioner when
there CLOUD_PROVIDER is not specified. This enables e2e test(s)
(specifically StatefulSetBasic) to work.
---
 cluster/addons/storage-class/local/default.yaml | 10 ++++++++++
 hack/local-up-cluster.sh                        |  6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 cluster/addons/storage-class/local/default.yaml

diff --git a/cluster/addons/storage-class/local/default.yaml b/cluster/addons/storage-class/local/default.yaml
new file mode 100644
index 00000000000..7e7d58b579c
--- /dev/null
+++ b/cluster/addons/storage-class/local/default.yaml
@@ -0,0 +1,10 @@
+apiVersion: storage.k8s.io/v1beta1
+kind: StorageClass
+metadata:
+  namespace: kube-system
+  name: standard
+  annotations:
+    storageclass.beta.kubernetes.io/is-default-class: "true"
+  labels:
+    addonmanager.kubernetes.io/mode: Reconcile
+provisioner: kubernetes.io/host-path
diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh
index e7ac7f63890..379a96a75ad 100755
--- a/hack/local-up-cluster.sh
+++ b/hack/local-up-cluster.sh
@@ -742,11 +742,11 @@ function create_psp_policy {
 
 function create_storage_class {
     if [ -z "$CLOUD_PROVIDER" ]; then
-        # No cloud provider -> no default storage class
-        return
+        CLASS_FILE=${KUBE_ROOT}/cluster/addons/storage-class/local/default.yaml
+    else
+        CLASS_FILE=${KUBE_ROOT}/cluster/addons/storage-class/${CLOUD_PROVIDER}/default.yaml
     fi
 
-    CLASS_FILE=${KUBE_ROOT}/cluster/addons/storage-class/${CLOUD_PROVIDER}/default.yaml
     if [ -e $CLASS_FILE ]; then
         echo "Create default storage class for $CLOUD_PROVIDER"
         ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" create -f $CLASS_FILE