use apimachinery packages instead of client-go packages

federation/pkg/kubefed/BUILD

@@ -61,7 +61,7 @@ go_test(
         "//pkg/kubectl/cmd/testing:go_default_library",
         "//pkg/kubectl/cmd/util:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
-        "//vendor:k8s.io/client-go/pkg/util/diff",
+        "//vendor:k8s.io/apimachinery/pkg/util/diff",
     ],
 )
 

federation/pkg/kubefed/init/BUILD

@@ -54,7 +54,7 @@ go_test(
         "//pkg/kubectl/cmd/util:go_default_library",
         "//pkg/util/intstr:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
-        "//vendor:k8s.io/client-go/pkg/util/diff",
+        "//vendor:k8s.io/apimachinery/pkg/util/diff",
     ],
 )
 

federation/pkg/kubefed/init/init_test.go

@@ -31,7 +31,7 @@ import (
 	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/pkg/util/diff"
+	"k8s.io/apimachinery/pkg/util/diff"
 	kubefedtesting "k8s.io/kubernetes/federation/pkg/kubefed/testing"
 	"k8s.io/kubernetes/federation/pkg/kubefed/util"
 	"k8s.io/kubernetes/pkg/api"

federation/pkg/kubefed/join_test.go

@@ -24,7 +24,7 @@ import (
 	"testing"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/pkg/util/diff"
+	"k8s.io/apimachinery/pkg/util/diff"
 	federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1"
 	kubefedtesting "k8s.io/kubernetes/federation/pkg/kubefed/testing"
 	"k8s.io/kubernetes/federation/pkg/kubefed/util"

pkg/registry/core/service/allocator/BUILD

@@ -26,7 +26,7 @@ go_test(
     ],
     library = ":go_default_library",
     tags = ["automanaged"],
-    deps = ["//vendor:k8s.io/client-go/pkg/util/sets"],
+    deps = ["//vendor:k8s.io/apimachinery/pkg/util/sets"],
 )
 
 filegroup(

pkg/registry/core/service/allocator/bitmap_test.go

@@ -19,7 +19,7 @@ package allocator
 import (
 	"testing"
 
-	"k8s.io/client-go/pkg/util/sets"
+	"k8s.io/apimachinery/pkg/util/sets"
 )
 
 func TestAllocate(t *testing.T) {

pkg/ssh/BUILD

@@ -16,7 +16,7 @@ go_test(
     deps = [
         "//vendor:github.com/golang/glog",
         "//vendor:golang.org/x/crypto/ssh",
-        "//vendor:k8s.io/client-go/pkg/util/wait",
+        "//vendor:k8s.io/apimachinery/pkg/util/wait",
     ],
 )
 
@@ -28,9 +28,9 @@ go_library(
         "//vendor:github.com/golang/glog",
         "//vendor:github.com/prometheus/client_golang/prometheus",
         "//vendor:golang.org/x/crypto/ssh",
-        "//vendor:k8s.io/client-go/pkg/util/net",
+        "//vendor:k8s.io/apimachinery/pkg/util/net",
-        "//vendor:k8s.io/client-go/pkg/util/runtime",
+        "//vendor:k8s.io/apimachinery/pkg/util/runtime",
-        "//vendor:k8s.io/client-go/pkg/util/wait",
+        "//vendor:k8s.io/apimachinery/pkg/util/wait",
     ],
 )
 

pkg/ssh/ssh.go

@@ -40,9 +40,9 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/crypto/ssh"
 
-	utilnet "k8s.io/client-go/pkg/util/net"
+	utilnet "k8s.io/apimachinery/pkg/util/net"
-	"k8s.io/client-go/pkg/util/runtime"
+	"k8s.io/apimachinery/pkg/util/runtime"
-	"k8s.io/client-go/pkg/util/wait"
+	"k8s.io/apimachinery/pkg/util/wait"
 )
 
 var (

pkg/ssh/ssh_test.go

@@ -26,7 +26,7 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/client-go/pkg/util/wait"
+	"k8s.io/apimachinery/pkg/util/wait"
 
 	"github.com/golang/glog"
 	"golang.org/x/crypto/ssh"

pkg/util/wsstream/BUILD

@@ -20,7 +20,6 @@ go_library(
         "//vendor:github.com/golang/glog",
         "//vendor:golang.org/x/net/websocket",
         "//vendor:k8s.io/apimachinery/pkg/util/runtime",
-        "//vendor:k8s.io/client-go/pkg/util/runtime",
     ],
 )
 

pkg/util/wsstream/stream.go

@@ -25,7 +25,7 @@ import (
 
 	"golang.org/x/net/websocket"
 
-	"k8s.io/client-go/pkg/util/runtime"
+	"k8s.io/apimachinery/pkg/util/runtime"
 )
 
 // The WebSocket subprotocol "binary.k8s.io" will only send messages to the

plugin/pkg/admission/imagepolicy/BUILD

@@ -28,7 +28,6 @@ go_library(
         "//vendor:k8s.io/client-go/pkg/api/errors",
         "//vendor:k8s.io/client-go/pkg/apis/imagepolicy/install",
         "//vendor:k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1",
-        "//vendor:k8s.io/client-go/pkg/runtime/schema",
         "//vendor:k8s.io/client-go/rest",
     ],
 )

plugin/pkg/admission/imagepolicy/admission.go

@@ -28,14 +28,14 @@ import (
 
 	"github.com/golang/glog"
 
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	kubeschema "k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/util/yaml"
 	"k8s.io/apiserver/pkg/util/cache"
 	apierrors "k8s.io/client-go/pkg/api/errors"
 	"k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1"
-	"k8s.io/client-go/pkg/runtime/schema"
 	"k8s.io/client-go/rest"
 
-	kubeschema "k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/util/yaml"
 	"k8s.io/kubernetes/pkg/admission"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/plugin/pkg/webhook"

plugin/pkg/auth/authenticator/request/headerrequest/BUILD

@@ -21,11 +21,11 @@ go_library(
     srcs = ["requestheader.go"],
     tags = ["automanaged"],
     deps = [
+        "//vendor:k8s.io/apimachinery/pkg/util/sets",
         "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
         "//vendor:k8s.io/apiserver/pkg/authentication/request/x509",
         "//vendor:k8s.io/apiserver/pkg/authentication/user",
         "//vendor:k8s.io/client-go/pkg/util/cert",
-        "//vendor:k8s.io/client-go/pkg/util/sets",
     ],
 )
 

plugin/pkg/auth/authenticator/request/headerrequest/requestheader.go

@@ -23,11 +23,11 @@ import (
 	"net/http"
 	"strings"
 
+	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apiserver/pkg/authentication/authenticator"
 	x509request "k8s.io/apiserver/pkg/authentication/request/x509"
 	"k8s.io/apiserver/pkg/authentication/user"
 	utilcert "k8s.io/client-go/pkg/util/cert"
-	"k8s.io/client-go/pkg/util/sets"
 )
 
 type requestHeaderAuthRequestHandler struct {

plugin/pkg/auth/authenticator/token/webhook/BUILD

@@ -15,13 +15,13 @@ go_library(
     deps = [
         "//pkg/apis/authentication/install:go_default_library",
         "//plugin/pkg/webhook:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
         "//vendor:k8s.io/apiserver/pkg/authentication/user",
         "//vendor:k8s.io/apiserver/pkg/util/cache",
         "//vendor:k8s.io/client-go/kubernetes/typed/authentication/v1beta1",
         "//vendor:k8s.io/client-go/pkg/apis/authentication/install",
         "//vendor:k8s.io/client-go/pkg/apis/authentication/v1beta1",
-        "//vendor:k8s.io/client-go/pkg/runtime/schema",
     ],
 )
 

plugin/pkg/auth/authenticator/token/webhook/webhook.go

@@ -20,12 +20,12 @@ package webhook
 import (
 	"time"
 
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/apiserver/pkg/util/cache"
 	authenticationclient "k8s.io/client-go/kubernetes/typed/authentication/v1beta1"
 	authentication "k8s.io/client-go/pkg/apis/authentication/v1beta1"
-	"k8s.io/client-go/pkg/runtime/schema"
 
 	"k8s.io/kubernetes/plugin/pkg/webhook"
 

plugin/pkg/auth/authorizer/webhook/BUILD

@@ -16,12 +16,12 @@ go_library(
         "//pkg/apis/authorization/install:go_default_library",
         "//plugin/pkg/webhook:go_default_library",
         "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
         "//vendor:k8s.io/apiserver/pkg/util/cache",
         "//vendor:k8s.io/client-go/kubernetes/typed/authorization/v1beta1",
         "//vendor:k8s.io/client-go/pkg/apis/authorization/install",
         "//vendor:k8s.io/client-go/pkg/apis/authorization/v1beta1",
-        "//vendor:k8s.io/client-go/pkg/runtime/schema",
     ],
 )
 

plugin/pkg/auth/authorizer/webhook/webhook.go

@@ -23,11 +23,11 @@ import (
 
 	"github.com/golang/glog"
 
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
 	"k8s.io/apiserver/pkg/util/cache"
 	authorizationclient "k8s.io/client-go/kubernetes/typed/authorization/v1beta1"
 	authorization "k8s.io/client-go/pkg/apis/authorization/v1beta1"
-	"k8s.io/client-go/pkg/runtime/schema"
 
 	"k8s.io/kubernetes/plugin/pkg/webhook"
 

plugin/pkg/webhook/BUILD

@@ -12,15 +12,13 @@ go_library(
     srcs = ["webhook.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
+        "//vendor:k8s.io/apimachinery/pkg/runtime/serializer",
+        "//vendor:k8s.io/apimachinery/pkg/util/wait",
         "//vendor:k8s.io/client-go/pkg/api",
         "//vendor:k8s.io/client-go/pkg/api/errors",
         "//vendor:k8s.io/client-go/pkg/apis/authorization/install",
-        "//vendor:k8s.io/client-go/pkg/runtime",
-        "//vendor:k8s.io/client-go/pkg/runtime/schema",
-        "//vendor:k8s.io/client-go/pkg/runtime/serializer",
-        "//vendor:k8s.io/client-go/pkg/util/wait",
         "//vendor:k8s.io/client-go/rest",
         "//vendor:k8s.io/client-go/tools/clientcmd",
     ],

plugin/pkg/webhook/webhook.go

@@ -21,18 +21,15 @@ import (
 	"fmt"
 	"time"
 
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/pkg/api"
 	apierrors "k8s.io/client-go/pkg/api/errors"
-	"k8s.io/client-go/pkg/runtime"
-	clientschema "k8s.io/client-go/pkg/runtime/schema"
-	runtimeserializer "k8s.io/client-go/pkg/runtime/serializer"
-	"k8s.io/client-go/pkg/util/wait"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 
-	kapi "k8s.io/kubernetes/pkg/api"
-
 	_ "k8s.io/client-go/pkg/apis/authorization/install"
 )
 
@@ -42,9 +39,9 @@ type GenericWebhook struct {
 }
 
 // NewGenericWebhook creates a new GenericWebhook from the provided kubeconfig file.
-func NewGenericWebhook(kubeConfigFile string, groupVersions []clientschema.GroupVersion, initialBackoff time.Duration) (*GenericWebhook, error) {
+func NewGenericWebhook(kubeConfigFile string, groupVersions []schema.GroupVersion, initialBackoff time.Duration) (*GenericWebhook, error) {
 	for _, groupVersion := range groupVersions {
-		if !kapi.Registry.IsEnabledVersion(schema.GroupVersion{Group: groupVersion.Group, Version: groupVersion.Version}) {
+		if !api.Registry.IsEnabledVersion(groupVersion) {
 			return nil, fmt.Errorf("webhook plugin requires enabling extension resource: %s", groupVersion)
 		}
 	}

staging/src/k8s.io/apiserver/pkg/authentication/request/union/union.go

@@ -19,9 +19,9 @@ package union
 import (
 	"net/http"
 
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
-	utilerrors "k8s.io/client-go/pkg/util/errors"
 )
 
 // unionAuthRequestHandler authenticates requests using a chain of authenticator.Requests

staging/src/k8s.io/apiserver/pkg/authentication/request/x509/x509.go

@@ -25,10 +25,10 @@ import (
 
 	"github.com/golang/glog"
 
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
+	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
-	utilerrors "k8s.io/client-go/pkg/util/errors"
-	"k8s.io/client-go/pkg/util/sets"
 )
 
 // UserConversion defines an interface for extracting user info from a client certificate chain

staging/src/k8s.io/apiserver/pkg/authentication/request/x509/x509_test.go

@@ -28,9 +28,9 @@ import (
     "testing"
     "time"
 
+    "k8s.io/apimachinery/pkg/util/sets"
     "k8s.io/apiserver/pkg/authentication/authenticator"
     "k8s.io/apiserver/pkg/authentication/user"
-	"k8s.io/client-go/pkg/util/sets"
 )
 
 const (

staging/src/k8s.io/apiserver/pkg/authorization/union/union.go

@@ -19,8 +19,8 @@ package union
 import (
 	"strings"
 
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
-	utilerrors "k8s.io/client-go/pkg/util/errors"
 )
 
 // unionAuthzHandler authorizer against a chain of authorizer.Authorizer

test/e2e/BUILD

@@ -211,7 +211,6 @@ go_library(
         "//vendor:k8s.io/client-go/kubernetes",
         "//vendor:k8s.io/client-go/pkg/api/v1",
         "//vendor:k8s.io/client-go/pkg/apis/extensions/v1beta1",
-        "//vendor:k8s.io/client-go/pkg/apis/meta/v1",
         "//vendor:k8s.io/client-go/pkg/apis/policy/v1beta1",
         "//vendor:k8s.io/client-go/pkg/util/intstr",
     ],

test/e2e/disruption.go

@@ -22,11 +22,11 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/pkg/api/v1"
 	extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
-	metav1 "k8s.io/client-go/pkg/apis/meta/v1"
 	policy "k8s.io/client-go/pkg/apis/policy/v1beta1"
 	"k8s.io/client-go/pkg/util/intstr"
 	"k8s.io/kubernetes/test/e2e/framework"

test/e2e/framework/BUILD

@@ -112,7 +112,6 @@ go_library(
         "//vendor:k8s.io/apimachinery/pkg/util/wait",
         "//vendor:k8s.io/apimachinery/pkg/watch",
         "//vendor:k8s.io/client-go/kubernetes",
-        "//vendor:k8s.io/client-go/pkg/util/sets",
         "//vendor:k8s.io/client-go/rest",
     ],
 )

test/e2e/framework/framework.go

@@ -29,9 +29,9 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/wait"
 	staging "k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/pkg/util/sets"
 	clientreporestclient "k8s.io/client-go/rest"
 	"k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
 	"k8s.io/kubernetes/pkg/api"