pkg: 1.6.1 updates

Author: Patrick Baxter

pkg/bootkube/bootkube.go

@@ -56,7 +56,7 @@ func NewBootkube(config Config) (*bootkube, error) {
 
 	cmServer := controller.NewCMServer()
 	fs = pflag.NewFlagSet("controllermanager", pflag.ExitOnError)
-	cmServer.AddFlags(fs)
+	cmServer.AddFlags(fs, cmapp.KnownControllers(), cmapp.ControllersDisabledByDefault.List())
 	flags, err = makeControllerManagerFlags(config)
 	if err != nil {
 		return nil, err

pkg/bootkube/create.go

@@ -6,15 +6,16 @@ import (
 	"time"
 
 	"github.com/golang/glog"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/wait"
+	restclient "k8s.io/client-go/rest"
+	"k8s.io/client-go/tools/clientcmd"
+	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 	"k8s.io/kubernetes/pkg/api"
-	apierrors "k8s.io/kubernetes/pkg/api/errors"
-	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	"k8s.io/kubernetes/pkg/client/restclient"
-	"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
-	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
+	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/kubectl/resource"
-	"k8s.io/kubernetes/pkg/util/wait"
 
 	"github.com/kubernetes-incubator/bootkube/pkg/util"
 )
@@ -146,6 +147,6 @@ func apiTest() error {
 	}
 
 	// System namespace has been created
-	_, err = client.Namespaces().Get(api.NamespaceSystem)
+	_, err = client.Namespaces().Get(api.NamespaceSystem, metav1.GetOptions{})
 	return err
 }

pkg/bootkube/status.go

@@ -8,15 +8,16 @@ import (
 	"time"
 
 	"github.com/golang/glog"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/apimachinery/pkg/watch"
+	restclient "k8s.io/client-go/rest"
+	"k8s.io/client-go/tools/cache"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/client/cache"
-	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	"k8s.io/kubernetes/pkg/client/restclient"
-	"k8s.io/kubernetes/pkg/labels"
-	"k8s.io/kubernetes/pkg/runtime"
-	"k8s.io/kubernetes/pkg/util/wait"
-	"k8s.io/kubernetes/pkg/watch"
+	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 )
 
 const (
@@ -61,13 +62,13 @@ func (s *statusController) Run() {
 		panic(err)
 	}
 
-	options := v1.ListOptions{LabelSelector: ls.String()}
+	options := metav1.ListOptions{LabelSelector: ls.String()}
 	podStore, podController := cache.NewInformer(
 		&cache.ListWatch{
-			ListFunc: func(lo api.ListOptions) (runtime.Object, error) {
+			ListFunc: func(lo metav1.ListOptions) (runtime.Object, error) {
 				return s.client.Core().Pods(api.NamespaceSystem).List(options)
 			},
-			WatchFunc: func(lo api.ListOptions) (watch.Interface, error) {
+			WatchFunc: func(lo metav1.ListOptions) (watch.Interface, error) {
 				return s.client.Core().Pods(api.NamespaceSystem).Watch(options)
 			},
 		},

pkg/util/etcdutil/migrate.go

@@ -12,12 +12,12 @@ import (
 	"github.com/coreos/etcd-operator/pkg/spec"
 	"github.com/coreos/etcd/clientv3"
 	"github.com/golang/glog"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/wait"
+	restclient "k8s.io/client-go/rest"
 	"k8s.io/kubernetes/pkg/api"
-	apierrors "k8s.io/kubernetes/pkg/api/errors"
-	"k8s.io/kubernetes/pkg/api/v1"
-	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	"k8s.io/kubernetes/pkg/client/restclient"
-	"k8s.io/kubernetes/pkg/util/wait"
+	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 )
 
 const (

pkg/util/log.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/golang/glog"
-	"k8s.io/kubernetes/pkg/util/wait"
+	"k8s.io/apimachinery/pkg/util/wait"
 )
 
 type GlogWriter struct{}