Skip to content

K
k3s
Commit e18f54f9 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #39444 from deads2k/generic-11-selectively

Automatic merge from submit-queue selectively move to client-go packages selectively update some low hanging fruit to use client-go. @sttts
parents acc81d6d 1ebe7597
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 59 deletions
pkg/auth/authorizer/union/BUILD
View file @ e18f54f9
......@@ -8,20 +8,20 @@ load(
"go_test",
)
go_test(
name = "go_default_test",
srcs = ["union_test.go"],
library = ":go_default_library",
tags = ["automanaged"],
deps = ["//pkg/auth/authorizer:go_default_library"],
)
go_library(
name = "go_default_library",
srcs = ["union.go"],
tags = ["automanaged"],
deps = [
"//pkg/auth/authorizer:go_default_library",
"//pkg/util/errors:go_default_library",
"//vendor:k8s.io/client-go/pkg/util/errors",
],
)
go_test(
name = "go_default_test",
srcs = ["union_test.go"],
library = ":go_default_library",
tags = ["automanaged"],
deps = ["//pkg/auth/authorizer:go_default_library"],
)
pkg/auth/authorizer/union/union.go
View file @ e18f54f9
......@@ -19,8 +19,8 @@ package union
import (
"strings"
utilerrors "k8s.io/client-go/pkg/util/errors"
"k8s.io/kubernetes/pkg/auth/authorizer"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
)
// unionAuthzHandler authorizer against a chain of authorizer.Authorizer
......
pkg/ssh/BUILD
View file @ e18f54f9
......@@ -13,12 +13,12 @@ go_library(
srcs = ["ssh.go"],
tags = ["automanaged"],
deps = [
"//pkg/util/net:go_default_library",
"//pkg/util/runtime:go_default_library",
"//pkg/util/wait:go_default_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/client-go/pkg/util/runtime",
"//vendor:k8s.io/client-go/pkg/util/wait",
],
)
......@@ -28,8 +28,8 @@ go_test(
library = ":go_default_library",
tags = ["automanaged"],
deps = [
"//pkg/util/wait:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:golang.org/x/crypto/ssh",
"//vendor:k8s.io/client-go/pkg/util/wait",
],
)
pkg/ssh/ssh.go
View file @ e18f54f9
......@@ -40,9 +40,9 @@ import (
"github.com/prometheus/client_golang/prometheus"
"golang.org/x/crypto/ssh"
utilnet "k8s.io/kubernetes/pkg/util/net"
"k8s.io/kubernetes/pkg/util/runtime"
"k8s.io/kubernetes/pkg/util/wait"
utilnet "k8s.io/client-go/pkg/util/net"
"k8s.io/client-go/pkg/util/runtime"
"k8s.io/client-go/pkg/util/wait"
)
var (
......
pkg/ssh/ssh_test.go
View file @ e18f54f9
......@@ -26,7 +26,7 @@ import (
"testing"
"time"
"k8s.io/kubernetes/pkg/util/wait"
"k8s.io/client-go/pkg/util/wait"
"github.com/golang/glog"
"golang.org/x/crypto/ssh"
......
pkg/util/wsstream/BUILD
View file @ e18f54f9
......@@ -20,6 +20,7 @@ go_library(
"//pkg/util/runtime:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:golang.org/x/net/websocket",
"//vendor:k8s.io/client-go/pkg/util/runtime",
],
)
......
pkg/util/wsstream/stream.go
View file @ e18f54f9
......@@ -25,7 +25,7 @@ import (
"golang.org/x/net/websocket"
"k8s.io/kubernetes/pkg/util/runtime"
"k8s.io/client-go/pkg/util/runtime"
)
// The WebSocket subprotocol "binary.k8s.io" will only send messages to the
......
plugin/pkg/auth/authenticator/request/headerrequest/BUILD
View file @ e18f54f9
......@@ -8,23 +8,23 @@ load(
"go_test",
)
go_test(
name = "go_default_test",
srcs = ["requestheader_test.go"],
library = ":go_default_library",
tags = ["automanaged"],
deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"],
)
go_library(
name = "go_default_library",
srcs = ["requestheader.go"],
tags = ["automanaged"],
deps = [
"//pkg/auth/authenticator:go_default_library",
"//pkg/util/cert:go_default_library",
"//pkg/util/sets:go_default_library",
"//plugin/pkg/auth/authenticator/request/x509:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
"//vendor:k8s.io/client-go/pkg/util/cert",
"//vendor:k8s.io/client-go/pkg/util/sets",
],
)
go_test(
name = "go_default_test",
srcs = ["requestheader_test.go"],
library = ":go_default_library",
tags = ["automanaged"],
deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"],
)
plugin/pkg/auth/authenticator/request/headerrequest/requestheader.go
View file @ e18f54f9
......@@ -24,9 +24,9 @@ import (
"strings"
"k8s.io/apiserver/pkg/authentication/user"
utilcert "k8s.io/client-go/pkg/util/cert"
"k8s.io/client-go/pkg/util/sets"
"k8s.io/kubernetes/pkg/auth/authenticator"
utilcert "k8s.io/kubernetes/pkg/util/cert"
"k8s.io/kubernetes/pkg/util/sets"
x509request "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/x509"
)
......
plugin/pkg/auth/authenticator/request/union/BUILD
View file @ e18f54f9
......@@ -8,21 +8,21 @@ load(
"go_test",
)
go_test(
name = "go_default_test",
srcs = ["unionauth_test.go"],
library = ":go_default_library",
tags = ["automanaged"],
deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"],
)
go_library(
name = "go_default_library",
srcs = ["union.go"],
tags = ["automanaged"],
deps = [
"//pkg/auth/authenticator:go_default_library",
"//pkg/util/errors:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
"//vendor:k8s.io/client-go/pkg/util/errors",
],
)
go_test(
name = "go_default_test",
srcs = ["unionauth_test.go"],
library = ":go_default_library",
tags = ["automanaged"],
deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"],
)
plugin/pkg/auth/authenticator/request/union/union.go
View file @ e18f54f9
......@@ -20,8 +20,8 @@ import (
"net/http"
"k8s.io/apiserver/pkg/authentication/user"
utilerrors "k8s.io/client-go/pkg/util/errors"
"k8s.io/kubernetes/pkg/auth/authenticator"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
)
// unionAuthRequestHandler authenticates requests using a chain of authenticator.Requests
......
plugin/pkg/auth/authenticator/request/x509/BUILD
View file @ e18f54f9
......@@ -8,31 +8,31 @@ load(
"go_test",
)
go_library(
name = "go_default_library",
srcs = [
"doc.go",
"x509.go",
],
go_test(
name = "go_default_test",
srcs = ["x509_test.go"],
data = glob(["testdata/*"]),
library = ":go_default_library",
tags = ["automanaged"],
deps = [
"//pkg/auth/authenticator:go_default_library",
"//pkg/util/errors:go_default_library",
"//pkg/util/sets:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
"//vendor:k8s.io/client-go/pkg/util/sets",
],
)
go_test(
name = "go_default_test",
srcs = ["x509_test.go"],
data = glob(["testdata/*"]),
library = ":go_default_library",
go_library(
name = "go_default_library",
srcs = [
"doc.go",
"x509.go",
],
tags = ["automanaged"],
deps = [
"//pkg/auth/authenticator:go_default_library",
"//pkg/util/sets:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
"//vendor:k8s.io/client-go/pkg/util/errors",
"//vendor:k8s.io/client-go/pkg/util/sets",
],
)
plugin/pkg/auth/authenticator/request/x509/x509.go
View file @ e18f54f9
......@@ -26,9 +26,9 @@ import (
"github.com/golang/glog"
"k8s.io/apiserver/pkg/authentication/user"
utilerrors "k8s.io/client-go/pkg/util/errors"
"k8s.io/client-go/pkg/util/sets"
"k8s.io/kubernetes/pkg/auth/authenticator"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
"k8s.io/kubernetes/pkg/util/sets"
)
// UserConversion defines an interface for extracting user info from a client certificate chain
......
plugin/pkg/auth/authenticator/request/x509/x509_test.go
View file @ e18f54f9
......@@ -29,8 +29,8 @@ import (
"time"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/client-go/pkg/util/sets"
"k8s.io/kubernetes/pkg/auth/authenticator"
"k8s.io/kubernetes/pkg/util/sets"
)
const (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment