kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use apimachinery packages instead of client-go packages

This commit is contained in:
deads2k 2017-01-12 10:17:12 -05:00
parent 77fc048e5f
commit d2037a9447
4 changed files with 370 additions and 370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/authentication/request/union/union.go
View File

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

4
pkg/authentication/request/x509/x509.go
View File

@ -25,10 +25,10 @@ import (
"github.com/golang/glog" "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/authenticator"
"k8s.io/apiserver/pkg/authentication/user" "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 // UserConversion defines an interface for extracting user info from a client certificate chain

2
pkg/authentication/request/x509/x509_test.go
View File

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

2
pkg/authorization/union/union.go
View File

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