Merge pull request #2060 from r2d4/k8s18

K8s 1.8

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"

hack/kube-proxy-patch.diff

@@ -1,13 +1,13 @@
-diff --git a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go
-index 8d1ae7774..8745a176f 100644
---- a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go
-+++ b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go
-@@ -422,7 +422,7 @@ func NewProxyServer(config *componentconfig.KubeProxyConfiguration, cleanupAndEx
+diff --git a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go
+index b0f0eace5..02b631fb6 100644
+--- a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go
++++ b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go
+@@ -60,7 +60,7 @@ func NewProxyServer(config *componentconfig.KubeProxyConfiguration, cleanupAndEx
  	if c, err := configz.New("componentconfig"); err == nil {
  		c.Set(config)
  	} else {
 -		return nil, fmt.Errorf("unable to register configz: %s", err)
-+		glog.Errorf("unable to register configz: %s", err)
++		glog.Warningf("unable to register configz: %s", err)
  	}
 
  	protocol := utiliptables.ProtocolIpv4

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)

pkg/localkube/storage_provisioner.go

@@ -20,32 +20,21 @@ 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"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/clientcmd"
 	"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

pkg/minikube/bootstrapper/kubeadm/util.go

@@ -22,14 +22,14 @@ import (
 	"html/template"
 
 	"github.com/pkg/errors"
+	clientv1 "k8s.io/api/core/v1"
+	rbacv1beta1 "k8s.io/api/rbac/v1beta1"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
-	clientv1 "k8s.io/client-go/pkg/api/v1"
-	rbacv1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1"
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
 	"k8s.io/minikube/pkg/minikube/service"
 	"k8s.io/minikube/pkg/util"

pkg/minikube/service/service.go

@@ -27,10 +27,10 @@ import (
 	"github.com/docker/machine/libmachine"
 	"github.com/pkg/browser"
 	"github.com/pkg/errors"
+	"k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/clientcmd"
 
 	"text/template"

pkg/minikube/service/service_test.go

@@ -25,11 +25,11 @@ import (
 	"github.com/docker/machine/libmachine"
 	"github.com/docker/machine/libmachine/host"
 	"github.com/pkg/errors"
+	"k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 	"k8s.io/client-go/kubernetes/typed/core/v1/fake"
-	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/tests"
 )

pkg/util/kubernetes.go

@@ -31,9 +31,9 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/kubernetes/cmd/kubeadm/app/constants"
 
+	"k8s.io/api/core/v1"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/pkg/api/v1"
 
 	"github.com/golang/glog"
 	"k8s.io/client-go/tools/cache"
@@ -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}
 }