published by bot

(https://github.com/kubernetes/contrib/tree/master/mungegithub)

copied from https://github.com/kubernetes/kubernetes.git, branch master,
last commit is e56cfc5322138aa23e6418ee30a6ab54c7c6fe8c
This commit is contained in:
Kubernetes Publisher
2016-10-21 04:44:19 +00:00
parent c72e2838b9
commit 75399f68c8
636 changed files with 83827 additions and 63845 deletions

View File

@@ -24,7 +24,7 @@ import (
"golang.org/x/net/context"
"golang.org/x/oauth2"
"golang.org/x/oauth2/google"
"k8s.io/client-go/1.5/rest"
"k8s.io/client-go/rest"
)
func init() {

View File

@@ -29,8 +29,8 @@ import (
"github.com/coreos/go-oidc/oidc"
"github.com/golang/glog"
"k8s.io/client-go/1.5/pkg/util/wait"
"k8s.io/client-go/1.5/rest"
"k8s.io/client-go/pkg/util/wait"
"k8s.io/client-go/rest"
)
const (

View File

@@ -33,9 +33,9 @@ import (
"github.com/coreos/go-oidc/key"
"github.com/coreos/go-oidc/oauth2"
"k8s.io/client-go/1.5/pkg/util/diff"
"k8s.io/client-go/1.5/pkg/util/wait"
oidctesting "k8s.io/client-go/1.5/plugin/pkg/auth/authenticator/token/oidc/testing"
"k8s.io/client-go/pkg/util/diff"
"k8s.io/client-go/pkg/util/wait"
oidctesting "k8s.io/client-go/plugin/pkg/auth/authenticator/token/oidc/testing"
)
func TestNewOIDCAuthProvider(t *testing.T) {
@@ -45,10 +45,7 @@ func TestNewOIDCAuthProvider(t *testing.T) {
}
cert := path.Join(tempDir, "oidc-cert")
key := path.Join(tempDir, "oidc-key")
defer os.Remove(cert)
defer os.Remove(key)
defer os.Remove(tempDir)
defer os.RemoveAll(tempDir)
oidctesting.GenerateSelfSignedCert(t, "127.0.0.1", cert, key)
op := oidctesting.NewOIDCProvider(t, "")

View File

@@ -18,6 +18,6 @@ package auth
import (
// Initialize all known client auth plugins.
_ "k8s.io/client-go/1.5/plugin/pkg/client/auth/gcp"
_ "k8s.io/client-go/1.5/plugin/pkg/client/auth/oidc"
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
)