use apimachinery packages instead of client-go packages

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

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

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 (

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