github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #67356 from yliaog/master

Browse Source 
Moved staging/src/k8s.io/client-go/tools/bootstrap to staging/src/k8s…
This commit is contained in:
k8s-ci-robot
2018-10-02 20:35:51 -07:00
committed by GitHub
parent 823fca1d93 fc21115c3f
commit c179a9c9df
64 changed files with 494 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/pkg/auth/authenticator/token/bootstrap/BUILD
View File

@@ -17,7 +17,7 @@ go_test(
"//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/authentication/user:go_default_library",
"//staging/src/k8s.io/client-go/tools/bootstrap/token/api:go_default_library",
"//staging/src/k8s.io/cluster-bootstrap/token/api:go_default_library",
],
)
@@ -31,8 +31,8 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/authentication/user:go_default_library",
"//staging/src/k8s.io/client-go/tools/bootstrap/token/api:go_default_library",
"//staging/src/k8s.io/client-go/tools/bootstrap/token/util:go_default_library",
"//staging/src/k8s.io/cluster-bootstrap/token/api:go_default_library",
"//staging/src/k8s.io/cluster-bootstrap/token/util:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
],
)

8
plugin/pkg/auth/authenticator/token/bootstrap/bootstrap.go
View File

@@ -31,8 +31,8 @@ import (
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apiserver/pkg/authentication/user"
bootstrapapi "k8s.io/client-go/tools/bootstrap/token/api"
bootstraputil "k8s.io/client-go/tools/bootstrap/token/util"
bootstrapapi "k8s.io/cluster-bootstrap/token/api"
bootstraputil "k8s.io/cluster-bootstrap/token/util"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/client/listers/core/internalversion"
)
@@ -150,7 +150,7 @@ func (t *TokenAuthenticator) AuthenticateToken(token string) (user.Info, bool, e
}, true, nil
}
// Copied from k8s.io/client-go/tools/bootstrap/token/api
// Copied from k8s.io/cluster-bootstrap/token/api
func getSecretString(secret *api.Secret, key string) string {
data, ok := secret.Data[key]
if !ok {
@@ -160,7 +160,7 @@ func getSecretString(secret *api.Secret, key string) string {
return string(data)
}
// Copied from k8s.io/client-go/tools/bootstrap/token/api
// Copied from k8s.io/cluster-bootstrap/token/api
func isSecretExpired(secret *api.Secret) bool {
expiration := getSecretString(secret, bootstrapapi.BootstrapTokenExpirationKey)
if len(expiration) > 0 {

2
plugin/pkg/auth/authenticator/token/bootstrap/bootstrap_test.go
View File

@@ -25,7 +25,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apiserver/pkg/authentication/user"
bootstrapapi "k8s.io/client-go/tools/bootstrap/token/api"
bootstrapapi "k8s.io/cluster-bootstrap/token/api"
api "k8s.io/kubernetes/pkg/apis/core"
)