pkg/k8s upgrade k8s api

Author: lijianguo

pkg/k8s/namespace.go

@@ -1,7 +1,9 @@
 package k8s
 
 import (
-	"k8s.io/kubernetes/pkg/api"
+	//"k8s.io/kubernetes/pkg/api"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	v1 "k8s.io/api/core/v1"
 )
 
 // NamespaceLister is a (k8s.io/kubernetes/pkg/client/unversioned).NamespaceInterface compatible
@@ -14,5 +16,5 @@ import (
 //	var nsl NamespaceLister
 //	nsl = kubeClient.Namespaces()
 type NamespaceLister interface {
-	List(opts api.ListOptions) (*api.NamespaceList, error)
+	List(opts metav1.ListOptions) (*v1.NamespaceList, error)
 }

pkg/k8s/pull_policy.go

@@ -2,17 +2,17 @@ package k8s
 
 import (
 	"fmt"
-
-	"k8s.io/kubernetes/pkg/api"
+	//"k8s.io/kubernetes/pkg/api"
+	"k8s.io/api/core/v1"
 )
 
 var (
-	emptyPullPolicy = api.PullPolicy("")
+	emptyPullPolicy = v1.PullPolicy("")
 	// ValidPullPolicies is the set of pull policies that this package considers valid
-	ValidPullPolicies = map[api.PullPolicy]struct{}{
-		api.PullAlways:       {},
-		api.PullIfNotPresent: {},
-		api.PullNever:        {},
+	ValidPullPolicies = map[v1.PullPolicy]struct{}{
+		v1.PullAlways:       {},
+		v1.PullIfNotPresent: {},
+		v1.PullNever:        {},
 	}
 )
 
@@ -27,8 +27,8 @@ func (e ErrInvalidPullPolicy) Error() string {
 }
 
 // PullPolicyFromString converts a string into an api.PullPolicy. returns an error if the string does not match a pull policy in ValidPullPolicies()
-func PullPolicyFromString(ppStr string) (api.PullPolicy, error) {
-	candidatePP := api.PullPolicy(ppStr)
+func PullPolicyFromString(ppStr string) (v1.PullPolicy, error) {
+	candidatePP := v1.PullPolicy(ppStr)
 	if _, ok := ValidPullPolicies[candidatePP]; !ok {
 		return emptyPullPolicy, ErrInvalidPullPolicy{str: ppStr}
 	}

pkg/k8s/secrets.go

@@ -1,22 +1,23 @@
 package k8s
 
 import (
-	"k8s.io/kubernetes/pkg/api"
-	client "k8s.io/kubernetes/pkg/client/unversioned"
-	"k8s.io/kubernetes/pkg/watch"
+	"k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/watch"
+	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 )
 
 // FakeSecret is a mock function that can be swapped in for
 // (k8s.io/kubernetes/pkg/client/unversioned).SecretsInterface,
 // so you can unit test your code.
 type FakeSecret struct {
-	FnGet    func(string) (*api.Secret, error)
-	FnCreate func(*api.Secret) (*api.Secret, error)
-	FnUpdate func(*api.Secret) (*api.Secret, error)
+	FnGet    func(string) (*v1.Secret, error)
+	FnCreate func(*v1.Secret) (*v1.Secret, error)
+	FnUpdate func(*v1.Secret) (*v1.Secret, error)
 }
 
 // Get is the interface definition.
-func (f *FakeSecret) Get(name string) (*api.Secret, error) {
+func (f *FakeSecret) Get(name string) (*v1.Secret, error) {
 	return f.FnGet(name)
 }
 
@@ -26,32 +27,32 @@ func (f *FakeSecret) Delete(name string) error {
 }
 
 // Create is the interface definition.
-func (f *FakeSecret) Create(secret *api.Secret) (*api.Secret, error) {
+func (f *FakeSecret) Create(secret *v1.Secret) (*v1.Secret, error) {
 	return f.FnCreate(secret)
 }
 
 // Update is the interface definition.
-func (f *FakeSecret) Update(secret *api.Secret) (*api.Secret, error) {
+func (f *FakeSecret) Update(secret *v1.Secret) (*v1.Secret, error) {
 	return f.FnUpdate(secret)
 }
 
 // List is the interface definition.
-func (f *FakeSecret) List(opts api.ListOptions) (*api.SecretList, error) {
-	return &api.SecretList{}, nil
+func (f *FakeSecret) List(opts metav1.ListOptions) (*v1.SecretList, error) {
+	return &v1.SecretList{}, nil
 }
 
 // Watch is the interface definition.
-func (f *FakeSecret) Watch(opts api.ListOptions) (watch.Interface, error) {
+func (f *FakeSecret) Watch(opts metav1.ListOptions) (watch.Interface, error) {
 	return nil, nil
 }
 
 // FakeSecretsNamespacer is a mock function that can be swapped in for an
 // (k8s.io/kubernetes/pkg/client/unversioned).SecretsNamespacer, so you can unit test you code
 type FakeSecretsNamespacer struct {
-	Fn func(string) client.SecretsInterface
+	Fn func(string) corev1.SecretInterface
 }
 
 // Secrets is the interface definition.
-func (f *FakeSecretsNamespacer) Secrets(namespace string) client.SecretsInterface {
+func (f *FakeSecretsNamespacer) Secrets(namespace string) corev1.SecretInterface {
 	return f.Fn(namespace)
 }

pkg/k8s/watch.go

@@ -2,56 +2,53 @@ package k8s
 
 import (
 	"time"
-
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/client/cache"
-	client "k8s.io/kubernetes/pkg/client/unversioned"
-	"k8s.io/kubernetes/pkg/controller/framework"
-	"k8s.io/kubernetes/pkg/labels"
-	"k8s.io/kubernetes/pkg/runtime"
-	"k8s.io/kubernetes/pkg/watch"
+	"context"
+	"k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/tools/cache"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/apimachinery/pkg/runtime"
 )
 
 var (
 	resyncPeriod = 30 * time.Second
 )
+type StoreToPodLister struct {
+	cache.Store
+}
 
 //PodWatcher is a struct which holds the return values of (k8s.io/kubernetes/pkg/controller/framework).NewIndexerInformer together.
 type PodWatcher struct {
-	Store      cache.StoreToPodLister
-	Controller *framework.Controller
+	Store      StoreToPodLister
+	Controller cache.Controller
 }
 
 //NewPodWatcher creates a new BuildPodWatcher useful to list the pods using a cache which gets updated based on the watch func.
-func NewPodWatcher(c *client.Client, ns string) *PodWatcher {
+func NewPodWatcher(c kubernetes.Interface, ns string) *PodWatcher {
 	pw := &PodWatcher{}
 
-	pw.Store.Store, pw.Controller = framework.NewIndexerInformer(
+	pw.Store.Store, pw.Controller = cache.NewIndexerInformer(
 		&cache.ListWatch{
 			ListFunc:  podListFunc(c, ns),
 			WatchFunc: podWatchFunc(c, ns),
 		},
-		&api.Pod{},
+		&v1.Pod{},
 		resyncPeriod,
-		framework.ResourceEventHandlerFuncs{},
+		cache.ResourceEventHandlerFuncs{},
 		cache.Indexers{},
 	)
-
 	return pw
 }
 
-func podListFunc(c *client.Client, ns string) func(options api.ListOptions) (runtime.Object, error) {
-	return func(opts api.ListOptions) (runtime.Object, error) {
-		return c.Pods(ns).List(api.ListOptions{
-			LabelSelector: labels.Everything(),
-		})
+func podListFunc(c kubernetes.Interface, ns string) func(options metav1.ListOptions) (runtime.Object, error) {
+	return func(opts metav1.ListOptions) (runtime.Object, error) {
+		return c.CoreV1().Pods(ns).List(context.TODO(), metav1.ListOptions{})
 	}
 }
 
-func podWatchFunc(c *client.Client, ns string) func(options api.ListOptions) (watch.Interface, error) {
-	return func(opts api.ListOptions) (watch.Interface, error) {
-		return c.Pods(ns).Watch(api.ListOptions{
-			LabelSelector: labels.Everything(),
-		})
+func podWatchFunc(c kubernetes.Interface, ns string) func(options metav1.ListOptions) (watch.Interface, error) {
+	return func(opts metav1.ListOptions) (watch.Interface, error) {
+		return c.CoreV1().Pods(ns).Watch(context.TODO(), metav1.ListOptions{})
 	}
 }