localkube changes

kubernetes · Oct 13, 2017 · 901c844 · 901c844
1 parent e5002af
commit 901c844
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/cmd/minikube/cmd/service_list.go b/cmd/minikube/cmd/service_list.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/olekukonko/tablewriter"
 	"github.com/spf13/cobra"
-	"k8s.io/kubernetes/pkg/api/v1"
+	"k8s.io/api/core/v1"
 
 	"k8s.io/minikube/pkg/minikube/machine"
 	"k8s.io/minikube/pkg/minikube/service"

diff --git a/pkg/localkube/kubelet.go b/pkg/localkube/kubelet.go
@@ -28,7 +28,10 @@ func (lk LocalkubeServer) NewKubeletServer() Server {
 }
 
 func StartKubeletServer(lk LocalkubeServer) func() error {
-	config := options.NewKubeletServer()
+	config, err := options.NewKubeletServer()
+	if err != nil {
+		return func() error { return err }
+	}
 
 	// Master details
 	config.KubeConfig = flag.NewStringFlag(util.DefaultKubeConfigPath)

diff --git a/pkg/localkube/storage_provisioner.go b/pkg/localkube/storage_provisioner.go
@@ -20,12 +20,10 @@ import (
 	"fmt"
 	"os"
 	"path"
-	"time"
 
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"github.com/r2d4/external-storage/lib/controller"
-	"github.com/r2d4/external-storage/lib/leaderelection"
 	"k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -36,16 +34,7 @@ import (
 	"k8s.io/minikube/pkg/util"
 )
 
-const (
-	resyncPeriod              = 15 * time.Second
-	provisionerName           = "k8s.io/minikube-hostpath"
-	exponentialBackOffOnError = false
-	failedRetryThreshold      = 5
-	leasePeriod               = leaderelection.DefaultLeaseDuration
-	retryPeriod               = leaderelection.DefaultRetryPeriod
-	renewDeadline             = leaderelection.DefaultRenewDeadline
-	termLimit                 = leaderelection.DefaultTermLimit
-)
+const provisionerName = "k8s.io/minikube-hostpath"
 
 type hostPathProvisioner struct {
 	// The directory to create PV-backing directories in
@@ -150,7 +139,7 @@ func StartStorageProvisioner(lk LocalkubeServer) func() error {
 
 		// Start the provision controller which will dynamically provision hostPath
 		// PVs
-		pc := controller.NewProvisionController(clientset, resyncPeriod, provisionerName, hostPathProvisioner, serverVersion.GitVersion, exponentialBackOffOnError, failedRetryThreshold, leasePeriod, renewDeadline, retryPeriod, termLimit)
+		pc := controller.NewProvisionController(clientset, provisionerName, hostPathProvisioner, serverVersion.GitVersion)
 
 		pc.Run(wait.NeverStop)
 		return nil

diff --git a/pkg/util/kubernetes.go b/pkg/util/kubernetes.go
@@ -91,7 +91,7 @@ func NewPodStore(c kubernetes.Interface, namespace string, label labels.Selector
 	store := cache.NewStore(cache.MetaNamespaceKeyFunc)
 	stopCh := make(chan struct{})
 	reflector := cache.NewReflector(lw, &v1.Pod{}, store, 0)
-	reflector.RunUntil(stopCh)
+	go reflector.Run(stopCh)
 	return &PodStore{Store: store, stopCh: stopCh, Reflector: reflector}
 }