From b9e3ffb515c37e982aceba14a9ac27d0ca846ead Mon Sep 17 00:00:00 2001
From: Chao Xu <xuchao@google.com>
Date: Fri, 18 Nov 2016 13:35:06 -0800
Subject: [PATCH] misc

---
 pkg/kubemark/hollow_kubelet.go                         | 2 +-
 pkg/proxy/config/api_test.go                           | 5 +++--
 plugin/pkg/auth/authenticator/token/webhook/webhook.go | 7 +++----
 plugin/pkg/auth/authorizer/webhook/webhook.go          | 7 +++----
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkg/kubemark/hollow_kubelet.go b/pkg/kubemark/hollow_kubelet.go
index 7847ad0488e..b0bd0ceb465 100644
--- a/pkg/kubemark/hollow_kubelet.go
+++ b/pkg/kubemark/hollow_kubelet.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 	"k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1"
-	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
+	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
 	"k8s.io/kubernetes/pkg/kubelet"
 	"k8s.io/kubernetes/pkg/kubelet/cadvisor"
 	"k8s.io/kubernetes/pkg/kubelet/cm"
diff --git a/pkg/proxy/config/api_test.go b/pkg/proxy/config/api_test.go
index 69256605826..8e0b1016a4f 100644
--- a/pkg/proxy/config/api_test.go
+++ b/pkg/proxy/config/api_test.go
@@ -21,6 +21,7 @@ import (
 	"time"
 
 	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/client/cache"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/watch"
@@ -31,11 +32,11 @@ type fakeLW struct {
 	watchResp watch.Interface
 }
 
-func (lw fakeLW) List(options api.ListOptions) (runtime.Object, error) {
+func (lw fakeLW) List(options v1.ListOptions) (runtime.Object, error) {
 	return lw.listResp, nil
 }
 
-func (lw fakeLW) Watch(options api.ListOptions) (watch.Interface, error) {
+func (lw fakeLW) Watch(options v1.ListOptions) (watch.Interface, error) {
 	return lw.watchResp, nil
 }
 
diff --git a/plugin/pkg/auth/authenticator/token/webhook/webhook.go b/plugin/pkg/auth/authenticator/token/webhook/webhook.go
index 86157f0459e..6dbbc60d859 100644
--- a/plugin/pkg/auth/authenticator/token/webhook/webhook.go
+++ b/plugin/pkg/auth/authenticator/token/webhook/webhook.go
@@ -21,18 +21,17 @@ import (
 	"time"
 
 	"k8s.io/kubernetes/pkg/api/unversioned"
-	"k8s.io/kubernetes/pkg/apis/authentication"
 	_ "k8s.io/kubernetes/pkg/apis/authentication/install"
-	"k8s.io/kubernetes/pkg/apis/authentication/v1beta1"
+	authentication "k8s.io/kubernetes/pkg/apis/authentication/v1beta1"
 	"k8s.io/kubernetes/pkg/auth/authenticator"
 	"k8s.io/kubernetes/pkg/auth/user"
-	authenticationclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion"
+	authenticationclient "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1"
 	"k8s.io/kubernetes/pkg/util/cache"
 	"k8s.io/kubernetes/plugin/pkg/webhook"
 )
 
 var (
-	groupVersions = []unversioned.GroupVersion{v1beta1.SchemeGroupVersion}
+	groupVersions = []unversioned.GroupVersion{authentication.SchemeGroupVersion}
 )
 
 const retryBackoff = 500 * time.Millisecond
diff --git a/plugin/pkg/auth/authorizer/webhook/webhook.go b/plugin/pkg/auth/authorizer/webhook/webhook.go
index 96a53a34094..a04202d2ac5 100644
--- a/plugin/pkg/auth/authorizer/webhook/webhook.go
+++ b/plugin/pkg/auth/authorizer/webhook/webhook.go
@@ -24,10 +24,9 @@ import (
 	"github.com/golang/glog"
 
 	"k8s.io/kubernetes/pkg/api/unversioned"
-	"k8s.io/kubernetes/pkg/apis/authorization"
-	"k8s.io/kubernetes/pkg/apis/authorization/v1beta1"
+	authorization "k8s.io/kubernetes/pkg/apis/authorization/v1beta1"
 	"k8s.io/kubernetes/pkg/auth/authorizer"
-	authorizationclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion"
+	authorizationclient "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1"
 	"k8s.io/kubernetes/pkg/util/cache"
 	"k8s.io/kubernetes/plugin/pkg/webhook"
 
@@ -35,7 +34,7 @@ import (
 )
 
 var (
-	groupVersions = []unversioned.GroupVersion{v1beta1.SchemeGroupVersion}
+	groupVersions = []unversioned.GroupVersion{authorization.SchemeGroupVersion}
 )
 
 const retryBackoff = 500 * time.Millisecond