Fixed merge conflicts and small changes

Author: Priya Wadhwa

cmd/storage-provisioner/main.go

@@ -1,3 +1,19 @@
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package main
 
 import (

deploy/addons/storage-provisioner/storage-provisioner.yaml

@@ -19,8 +19,7 @@ metadata:
   namespace: kube-system
   labels:
     integration-test: storage-provisioner
-    addonmanager.kubernetes.io/mode: Reconcile
-    kubernetes.io/minikube-addons: storage-provisioner
+    addonmanager.kubernetes.io/mode: EnsureExists
 spec:
   hostNetwork: true
   containers:

deploy/storage-provisioner/Dockerfile

@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ubuntu:16.04
-
+FROM scratch
 COPY main main
-
 CMD ["/main"]
-

pkg/localkube/storage_provisioner.go

@@ -139,7 +139,7 @@ func StartStorageProvisioner(lk LocalkubeServer) func() error {
 		// PVs
 		pc := controller.NewProvisionController(clientset, provisionerName, hostPathProvisioner, serverVersion.GitVersion)
 
-		fmt.Println("wait never stop")
+		glog.Info("Starting storage provisioner server")
 		pc.Run(wait.NeverStop)
 		return nil
 	}

pkg/minikube/constants/constants.go

@@ -181,6 +181,9 @@ var LocalkubeCachedImages = []string{
 
 	// Pause
 	"gcr.io/google_containers/pause-amd64:3.0",
+
+	//Storage provisioner
+	"gcr.io/k8s-minikube/storage-provisioner:v1.8.0",
 }
 
 func GetKubeadmCachedImages(version string) []string {
@@ -206,7 +209,9 @@ func GetKubeadmCachedImages(version string) []string {
 		"gcr.io/google_containers/kube-scheduler-amd64:" + version,
 		"gcr.io/google_containers/kube-controller-manager-amd64:" + version,
 		"gcr.io/google_containers/kube-apiserver-amd64:" + version,
-	}
+
+		//Storage provisioner
+		"gcr.io/k8s-minikube/storage-provisioner:v1.8.0"}
 }
 
 var ImageCacheDir = MakeMiniPath("cache", "images")

test/integration/functional_test.go

@@ -35,11 +35,7 @@ func TestFunctional(t *testing.T) {
 	t.Run("Addons", testAddons)
 	t.Run("Dashboard", testDashboard)
 	t.Run("ServicesList", testServicesList)
-
-	// Don't run this test on kubeadm bootstrapper for now.
-	if !strings.Contains(*args, "--bootstrapper=kubeadm") {
-		t.Run("Provisioning", testProvisioning)
-	}
+	t.Run("Provisioning", testProvisioning)
 
 	if !strings.Contains(minikubeRunner.StartArgs, "--vm-driver=none") {
 		t.Run("EnvVars", testClusterEnv)