scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-31 02:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

mechanicals

Browse Source
This commit is contained in:
deads2k
2017-01-04 10:39:05 -05:00
parent b813e98a26
commit 4d7fcae85a
125 changed files with 215 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/cloud-controller-manager/BUILD
View File

@@ -24,12 +24,12 @@ go_library(
"//pkg/client/metrics/prometheus:go_default_library",
"//pkg/cloudprovider:go_default_library",
"//pkg/cloudprovider/providers:go_default_library",
"//pkg/healthz:go_default_library",
"//pkg/util/flag:go_default_library",
"//pkg/util/logs:go_default_library",
"//pkg/version/prometheus:go_default_library",
"//pkg/version/verflag:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:github.com/spf13/pflag",
"//vendor:k8s.io/apiserver/pkg/healthz",
],
)

2
cmd/cloud-controller-manager/app/BUILD
View File

@@ -27,12 +27,12 @@ go_library(
"//pkg/controller/informers:go_default_library",
"//pkg/controller/route:go_default_library",
"//pkg/controller/service:go_default_library",
"//pkg/healthz:go_default_library",
"//pkg/util/configz:go_default_library",
"//pkg/util/wait:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:github.com/prometheus/client_golang/prometheus",
"//vendor:github.com/spf13/cobra",
"//vendor:github.com/spf13/pflag",
"//vendor:k8s.io/apiserver/pkg/healthz",
],
)

2
cmd/cloud-controller-manager/app/controllermanager.go
View File

@@ -25,6 +25,7 @@ import (
"strconv"
"time"
"k8s.io/apiserver/pkg/healthz"
"k8s.io/kubernetes/cmd/cloud-controller-manager/app/options"
"k8s.io/kubernetes/pkg/api/v1"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
@@ -40,7 +41,6 @@ import (
"k8s.io/kubernetes/pkg/controller/informers"
routecontroller "k8s.io/kubernetes/pkg/controller/route"
servicecontroller "k8s.io/kubernetes/pkg/controller/service"
"k8s.io/kubernetes/pkg/healthz"
"k8s.io/kubernetes/pkg/util/configz"
"k8s.io/kubernetes/pkg/util/wait"

2
cmd/cloud-controller-manager/controller-manager.go
View File

@@ -23,12 +23,12 @@ import (
"fmt"
"os"
"k8s.io/apiserver/pkg/healthz"
"k8s.io/kubernetes/cmd/cloud-controller-manager/app"
"k8s.io/kubernetes/cmd/cloud-controller-manager/app/options"
_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration
"k8s.io/kubernetes/pkg/cloudprovider"
_ "k8s.io/kubernetes/pkg/cloudprovider/providers"
"k8s.io/kubernetes/pkg/healthz"
"k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/util/logs"
_ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration

2
cmd/hyperkube/BUILD
View File

@@ -56,7 +56,6 @@ go_library(
"//federation/cmd/federation-controller-manager/app:go_default_library",
"//federation/cmd/federation-controller-manager/app/options:go_default_library",
"//pkg/client/metrics/prometheus:go_default_library",
"//pkg/healthz:go_default_library",
"//pkg/kubectl/cmd:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library",
"//pkg/util:go_default_library",
@@ -67,5 +66,6 @@ go_library(
"//plugin/cmd/kube-scheduler/app:go_default_library",
"//plugin/cmd/kube-scheduler/app/options:go_default_library",
"//vendor:github.com/spf13/pflag",
"//vendor:k8s.io/apiserver/pkg/healthz",
],
)

2
cmd/hyperkube/kube-proxy.go
View File

@@ -17,9 +17,9 @@ limitations under the License.
package main
import (
"k8s.io/apiserver/pkg/healthz"
"k8s.io/kubernetes/cmd/kube-proxy/app"
"k8s.io/kubernetes/cmd/kube-proxy/app/options"
"k8s.io/kubernetes/pkg/healthz"
)
func init() {

2
cmd/kube-controller-manager/BUILD
View File

@@ -22,12 +22,12 @@ go_library(
"//cmd/kube-controller-manager/app:go_default_library",
"//cmd/kube-controller-manager/app/options:go_default_library",
"//pkg/client/metrics/prometheus:go_default_library",
"//pkg/healthz:go_default_library",
"//pkg/util/flag:go_default_library",
"//pkg/util/logs:go_default_library",
"//pkg/util/workqueue/prometheus:go_default_library",
"//pkg/version/prometheus:go_default_library",
"//pkg/version/verflag:go_default_library",
"//vendor:github.com/spf13/pflag",
"//vendor:k8s.io/apiserver/pkg/healthz",
],
)

2
cmd/kube-controller-manager/app/BUILD
View File

@@ -72,7 +72,6 @@ go_library(
"//pkg/controller/serviceaccount:go_default_library",
"//pkg/controller/volume/attachdetach:go_default_library",
"//pkg/controller/volume/persistentvolume:go_default_library",
"//pkg/healthz:go_default_library",
"//pkg/quota/install:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/runtime/serializer:go_default_library",
@@ -100,5 +99,6 @@ go_library(
"//vendor:github.com/prometheus/client_golang/prometheus",
"//vendor:github.com/spf13/cobra",
"//vendor:github.com/spf13/pflag",
"//vendor:k8s.io/apiserver/pkg/healthz",
],
)

2
cmd/kube-controller-manager/app/controllermanager.go
View File

@@ -31,6 +31,7 @@ import (
"strconv"
"time"
"k8s.io/apiserver/pkg/healthz"
"k8s.io/kubernetes/cmd/kube-controller-manager/app/options"
"k8s.io/kubernetes/pkg/api/v1"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
@@ -50,7 +51,6 @@ import (
serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount"
"k8s.io/kubernetes/pkg/controller/volume/attachdetach"
persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/volume/persistentvolume"
"k8s.io/kubernetes/pkg/healthz"
"k8s.io/kubernetes/pkg/runtime/schema"
"k8s.io/kubernetes/pkg/serviceaccount"
certutil "k8s.io/kubernetes/pkg/util/cert"

2
cmd/kube-controller-manager/controller-manager.go
View File

@@ -24,10 +24,10 @@ import (
"fmt"
"os"
"k8s.io/apiserver/pkg/healthz"
"k8s.io/kubernetes/cmd/kube-controller-manager/app"
"k8s.io/kubernetes/cmd/kube-controller-manager/app/options"
_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration
"k8s.io/kubernetes/pkg/healthz"
"k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/util/logs"
_ "k8s.io/kubernetes/pkg/util/workqueue/prometheus" // for workqueue metric registration

2
cmd/kube-proxy/BUILD
View File

@@ -22,11 +22,11 @@ go_library(
"//cmd/kube-proxy/app:go_default_library",
"//cmd/kube-proxy/app/options:go_default_library",
"//pkg/client/metrics/prometheus:go_default_library",
"//pkg/healthz:go_default_library",
"//pkg/util/flag:go_default_library",
"//pkg/util/logs:go_default_library",
"//pkg/version/prometheus:go_default_library",
"//pkg/version/verflag:go_default_library",
"//vendor:github.com/spf13/pflag",
"//vendor:k8s.io/apiserver/pkg/healthz",
],
)

2
cmd/kube-proxy/proxy.go
View File

@@ -20,10 +20,10 @@ import (
"fmt"
"os"
"k8s.io/apiserver/pkg/healthz"
"k8s.io/kubernetes/cmd/kube-proxy/app"
"k8s.io/kubernetes/cmd/kube-proxy/app/options"
_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration
"k8s.io/kubernetes/pkg/healthz"
"k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/util/logs"
_ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration

6
cmd/kubelet/app/BUILD
View File

@@ -25,8 +25,6 @@ go_library(
"//pkg/apis/componentconfig:go_default_library",
"//pkg/apis/componentconfig/v1alpha1:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//pkg/auth/authenticator:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//pkg/capabilities:go_default_library",
"//pkg/client/chaosclient:go_default_library",
"//pkg/client/clientset_generated/clientset:go_default_library",
@@ -47,7 +45,6 @@ go_library(
"//pkg/credentialprovider/gcp:go_default_library",
"//pkg/genericapiserver/authenticator:go_default_library",
"//pkg/genericapiserver/authorizer:go_default_library",
"//pkg/healthz:go_default_library",
"//pkg/kubelet:go_default_library",
"//pkg/kubelet/cadvisor:go_default_library",
"//pkg/kubelet/cm:go_default_library",
@@ -101,6 +98,9 @@ go_library(
"//vendor:github.com/spf13/cobra",
"//vendor:github.com/spf13/pflag",
"//vendor:golang.org/x/exp/inotify",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
"//vendor:k8s.io/apiserver/pkg/healthz",
],
)

4
cmd/kubelet/app/auth.go
View File

@@ -21,9 +21,9 @@ import (
"fmt"
"reflect"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/kubernetes/pkg/apis/componentconfig"
"k8s.io/kubernetes/pkg/auth/authenticator"
"k8s.io/kubernetes/pkg/auth/authorizer"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
authenticationclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1"
authorizationclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1"

2
cmd/kubelet/app/server.go
View File

@@ -36,6 +36,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"k8s.io/apiserver/pkg/healthz"
"k8s.io/kubernetes/cmd/kubelet/app/options"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
@@ -53,7 +54,6 @@ import (
clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
"k8s.io/kubernetes/pkg/cloudprovider"
"k8s.io/kubernetes/pkg/credentialprovider"
"k8s.io/kubernetes/pkg/healthz"
"k8s.io/kubernetes/pkg/kubelet"
"k8s.io/kubernetes/pkg/kubelet/cadvisor"
"k8s.io/kubernetes/pkg/kubelet/cm"

2
federation/cmd/federation-controller-manager/BUILD
View File

@@ -21,11 +21,11 @@ go_library(
deps = [
"//federation/cmd/federation-controller-manager/app:go_default_library",
"//federation/cmd/federation-controller-manager/app/options:go_default_library",
"//pkg/healthz:go_default_library",
"//pkg/util/flag:go_default_library",
"//pkg/util/logs:go_default_library",
"//pkg/util/workqueue/prometheus:go_default_library",
"//pkg/version/verflag:go_default_library",
"//vendor:github.com/spf13/pflag",
"//vendor:k8s.io/apiserver/pkg/healthz",
],
)

2
federation/cmd/federation-controller-manager/app/BUILD
View File

@@ -36,7 +36,6 @@ go_library(
"//pkg/client/restclient:go_default_library",
"//pkg/client/typed/discovery:go_default_library",
"//pkg/client/unversioned/clientcmd:go_default_library",
"//pkg/healthz:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/util/config:go_default_library",
"//pkg/util/configz:go_default_library",
@@ -46,6 +45,7 @@ go_library(
"//vendor:github.com/prometheus/client_golang/prometheus",
"//vendor:github.com/spf13/cobra",
"//vendor:github.com/spf13/pflag",
"//vendor:k8s.io/apiserver/pkg/healthz",
],
)

2
federation/cmd/federation-controller-manager/app/controllermanager.go
View File

@@ -26,6 +26,7 @@ import (
"net/http/pprof"
"strconv"
"k8s.io/apiserver/pkg/healthz"
federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
"k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options"
"k8s.io/kubernetes/federation/pkg/dnsprovider"
@@ -42,7 +43,6 @@ import (
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
"k8s.io/kubernetes/pkg/healthz"
"k8s.io/kubernetes/pkg/util/configz"
"k8s.io/kubernetes/pkg/util/wait"
"k8s.io/kubernetes/pkg/version"

2
federation/cmd/federation-controller-manager/controller-manager.go
View File

@@ -21,9 +21,9 @@ import (
"os"
"github.com/spf13/pflag"
"k8s.io/apiserver/pkg/healthz"
"k8s.io/kubernetes/federation/cmd/federation-controller-manager/app"
"k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options"
"k8s.io/kubernetes/pkg/healthz"
"k8s.io/kubernetes/pkg/util/flag"
"k8s.io/kubernetes/pkg/util/logs"
_ "k8s.io/kubernetes/pkg/util/workqueue/prometheus" // for workqueue metric registration

4
pkg/auth/authenticator/bearertoken/BUILD
View File

@@ -13,7 +13,7 @@ go_library(
srcs = ["bearertoken.go"],
tags = ["automanaged"],
deps = [
"//pkg/auth/authenticator:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
],
)
@@ -24,7 +24,7 @@ go_test(
library = ":go_default_library",
tags = ["automanaged"],
deps = [
"//pkg/auth/authenticator:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
],
)

2
pkg/auth/authenticator/bearertoken/bearertoken.go
View File

@@ -21,8 +21,8 @@ import (
"net/http"
"strings"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/kubernetes/pkg/auth/authenticator"
)
type Authenticator struct {

2
pkg/auth/authenticator/bearertoken/bearertoken_test.go
View File

@@ -21,8 +21,8 @@ import (
"net/http"
"testing"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/kubernetes/pkg/auth/authenticator"
)
func TestAuthenticateRequest(t *testing.T) {

4
pkg/auth/authorizer/abac/BUILD
View File

@@ -16,9 +16,9 @@ go_library(
"//pkg/apis/abac:go_default_library",
"//pkg/apis/abac/latest:go_default_library",
"//pkg/apis/abac/v0:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//pkg/runtime:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
],
)
@@ -42,8 +42,8 @@ go_test(
"//pkg/apis/abac:go_default_library",
"//pkg/apis/abac/v0:go_default_library",
"//pkg/apis/abac/v1beta1:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//pkg/runtime:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
],
)

2
pkg/auth/authorizer/abac/abac.go
View File

@@ -27,10 +27,10 @@ import (
"github.com/golang/glog"
"k8s.io/apiserver/pkg/authorization/authorizer"
api "k8s.io/kubernetes/pkg/apis/abac"
_ "k8s.io/kubernetes/pkg/apis/abac/latest"
"k8s.io/kubernetes/pkg/apis/abac/v0"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/kubernetes/pkg/runtime"
)

2
pkg/auth/authorizer/abac/abac_test.go
View File

@@ -22,10 +22,10 @@ import (
"testing"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/authorization/authorizer"
api "k8s.io/kubernetes/pkg/apis/abac"
"k8s.io/kubernetes/pkg/apis/abac/v0"
"k8s.io/kubernetes/pkg/apis/abac/v1beta1"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/kubernetes/pkg/runtime"
)

4
pkg/auth/authorizer/union/BUILD
View File

@@ -13,7 +13,7 @@ go_test(
srcs = ["union_test.go"],
library = ":go_default_library",
tags = ["automanaged"],
deps = ["//pkg/auth/authorizer:go_default_library"],
deps = ["//vendor:k8s.io/apiserver/pkg/authorization/authorizer"],
)
go_library(
@@ -21,7 +21,7 @@ go_library(
srcs = ["union.go"],
tags = ["automanaged"],
deps = [
"//pkg/auth/authorizer:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
"//vendor:k8s.io/client-go/pkg/util/errors",
],
)

2
pkg/auth/authorizer/union/union.go
View File

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

2
pkg/auth/authorizer/union/union_test.go
View File

@@ -20,7 +20,7 @@ import (
"fmt"
"testing"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/apiserver/pkg/authorization/authorizer"
)
type mockAuthzHandler struct {

4
pkg/auth/group/BUILD
View File

@@ -13,7 +13,7 @@ go_library(
srcs = ["group_adder.go"],
tags = ["automanaged"],
deps = [
"//pkg/auth/authenticator:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
],
)
@@ -24,7 +24,7 @@ go_test(
library = ":go_default_library",
tags = ["automanaged"],
deps = [
"//pkg/auth/authenticator:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
],
)

2
pkg/auth/group/group_adder.go
View File

@@ -19,8 +19,8 @@ package group
import (
"net/http"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/kubernetes/pkg/auth/authenticator"
)
// GroupAdder adds groups to an authenticated user.Info

2
pkg/auth/group/group_adder_test.go
View File

@@ -21,8 +21,8 @@ import (
"reflect"
"testing"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/kubernetes/pkg/auth/authenticator"
)
func TestGroupAdder(t *testing.T) {

4
pkg/auth/handlers/BUILD
View File

@@ -13,10 +13,10 @@ go_library(
srcs = ["handlers.go"],
tags = ["automanaged"],
deps = [
"//pkg/auth/authenticator:go_default_library",
"//pkg/genericapiserver/api/request:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:github.com/prometheus/client_golang/prometheus",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
],
)
@@ -26,8 +26,8 @@ go_test(
library = ":go_default_library",
tags = ["automanaged"],
deps = [
"//pkg/auth/authenticator:go_default_library",
"//pkg/genericapiserver/api/request:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
],
)

2
pkg/auth/handlers/handlers.go
View File

@@ -23,7 +23,7 @@ import (
"github.com/golang/glog"
"github.com/prometheus/client_golang/prometheus"
"k8s.io/kubernetes/pkg/auth/authenticator"
"k8s.io/apiserver/pkg/authentication/authenticator"
genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request"
)

2
pkg/auth/handlers/handlers_test.go
View File

@@ -22,8 +22,8 @@ import (
"net/http/httptest"
"testing"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/kubernetes/pkg/auth/authenticator"
genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request"
)

8
pkg/genericapiserver/BUILD
View File

@@ -33,8 +33,6 @@ go_library(
"//pkg/apimachinery:go_default_library",
"//pkg/apimachinery/registered:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//pkg/auth/authenticator:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//pkg/auth/authorizer/union:go_default_library",
"//pkg/auth/handlers:go_default_library",
"//pkg/client/restclient:go_default_library",
@@ -49,7 +47,6 @@ go_library(
"//pkg/genericapiserver/openapi/common:go_default_library",
"//pkg/genericapiserver/options:go_default_library",
"//pkg/genericapiserver/routes:go_default_library",
"//pkg/healthz:go_default_library",
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/runtime/serializer/recognizer:go_default_library",
@@ -75,7 +72,10 @@ go_library(
"//vendor:github.com/pkg/errors",
"//vendor:github.com/prometheus/client_golang/prometheus",
"//vendor:gopkg.in/natefinch/lumberjack.v2",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
"//vendor:k8s.io/apiserver/pkg/healthz",
],
)
@@ -104,7 +104,6 @@ go_test(
"//pkg/apis/extensions:go_default_library",
"//pkg/apis/extensions/v1beta1:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/generated/openapi:go_default_library",
"//pkg/genericapiserver/api/request:go_default_library",
@@ -122,5 +121,6 @@ go_test(
"//vendor:github.com/go-openapi/spec",
"//vendor:github.com/stretchr/testify/assert",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
],
)

4
pkg/genericapiserver/api/filters/BUILD
View File

@@ -21,7 +21,6 @@ go_library(
deps = [
"//pkg/api:go_default_library",
"//pkg/apis/authentication:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//pkg/genericapiserver/api/handlers/responsewriters:go_default_library",
"//pkg/genericapiserver/api/request:go_default_library",
"//pkg/httplog:go_default_library",
@@ -30,6 +29,7 @@ go_library(
"//vendor:github.com/golang/glog",
"//vendor:github.com/pborman/uuid",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
],
)
@@ -46,10 +46,10 @@ go_test(
deps = [
"//pkg/apis/authentication:go_default_library",
"//pkg/apis/batch:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//pkg/genericapiserver/api/handlers/responsewriters:go_default_library",
"//pkg/genericapiserver/api/request:go_default_library",
"//pkg/util/sets:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
],
)

2
pkg/genericapiserver/api/filters/authorization.go
View File

@@ -22,7 +22,7 @@ import (
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters"
"k8s.io/kubernetes/pkg/genericapiserver/api/request"
)

2
pkg/genericapiserver/api/filters/authorization_test.go
View File

@@ -23,8 +23,8 @@ import (
"reflect"
"testing"
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/kubernetes/pkg/apis/batch"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters"
"k8s.io/kubernetes/pkg/genericapiserver/api/request"
)

2
pkg/genericapiserver/api/filters/impersonation.go
View File

@@ -25,9 +25,9 @@ import (
"github.com/golang/glog"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/kubernetes/pkg/api"
authenticationapi "k8s.io/kubernetes/pkg/apis/authentication"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/kubernetes/pkg/genericapiserver/api/handlers/responsewriters"
"k8s.io/kubernetes/pkg/genericapiserver/api/request"
"k8s.io/kubernetes/pkg/httplog"

2
pkg/genericapiserver/api/filters/impersonation_test.go
View File

@@ -25,8 +25,8 @@ import (
"testing"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/authorization/authorizer"
authenticationapi "k8s.io/kubernetes/pkg/apis/authentication"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/kubernetes/pkg/genericapiserver/api/request"
)

4
pkg/genericapiserver/api/handlers/responsewriters/BUILD
View File

@@ -33,13 +33,13 @@ go_library(
deps = [
"//pkg/api/rest:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//pkg/genericapiserver/api/handlers/negotiation:go_default_library",
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//pkg/storage:go_default_library",
"//pkg/util/flushwriter:go_default_library",
"//pkg/util/runtime:go_default_library",
"//pkg/util/wsstream:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
"//vendor:k8s.io/apiserver/pkg/util/flushwriter",
],
)

2
pkg/genericapiserver/api/handlers/responsewriters/errors.go
View File

@@ -20,7 +20,7 @@ import (
"fmt"
"net/http"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/kubernetes/pkg/util/runtime"
)

2
pkg/genericapiserver/api/handlers/responsewriters/writers.go
View File

@@ -23,11 +23,11 @@ import (
"net/http"
"strconv"
"k8s.io/apiserver/pkg/util/flushwriter"
"k8s.io/kubernetes/pkg/api/rest"
"k8s.io/kubernetes/pkg/genericapiserver/api/handlers/negotiation"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/schema"
"k8s.io/kubernetes/pkg/util/flushwriter"
utilruntime "k8s.io/kubernetes/pkg/util/runtime"
"k8s.io/kubernetes/pkg/util/wsstream"
)

2
pkg/genericapiserver/authenticator/BUILD
View File

@@ -16,7 +16,6 @@ go_library(
],
tags = ["automanaged"],
deps = [
"//pkg/auth/authenticator:go_default_library",
"//pkg/auth/authenticator/bearertoken:go_default_library",
"//pkg/auth/group:go_default_library",
"//pkg/client/clientset_generated/clientset/typed/authentication/v1beta1:go_default_library",
@@ -28,6 +27,7 @@ go_library(
"//plugin/pkg/auth/authenticator/token/tokenfile:go_default_library",
"//plugin/pkg/auth/authenticator/token/webhook:go_default_library",
"//vendor:github.com/go-openapi/spec",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
],
)

2
pkg/genericapiserver/authenticator/delegating.go
View File

@@ -23,8 +23,8 @@ import (
"github.com/go-openapi/spec"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/kubernetes/pkg/auth/authenticator"
"k8s.io/kubernetes/pkg/auth/authenticator/bearertoken"
"k8s.io/kubernetes/pkg/auth/group"
authenticationclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1"

2
pkg/genericapiserver/authenticator/loopback.go
View File

@@ -17,8 +17,8 @@ limitations under the License.
package authenticator
import (
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/kubernetes/pkg/auth/authenticator"
"k8s.io/kubernetes/pkg/auth/authenticator/bearertoken"
"k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/tokenfile"
)

4
pkg/genericapiserver/authorizer/BUILD
View File

@@ -16,9 +16,9 @@ go_library(
],
tags = ["automanaged"],
deps = [
"//pkg/auth/authorizer:go_default_library",
"//pkg/client/clientset_generated/clientset/typed/authorization/v1beta1:go_default_library",
"//plugin/pkg/auth/authorizer/webhook:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
],
)
@@ -31,7 +31,7 @@ go_test(
library = ":go_default_library",
tags = ["automanaged"],
deps = [
"//pkg/auth/authorizer:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
],
)

2
pkg/genericapiserver/authorizer/authz_test.go
View File

@@ -20,7 +20,7 @@ import (
"testing"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/apiserver/pkg/authorization/authorizer"
)
// NewAlwaysAllowAuthorizer must return a struct which implements authorizer.Authorizer

2
pkg/genericapiserver/authorizer/builtin.go
View File

@@ -19,7 +19,7 @@ package authorizer
import (
"errors"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/apiserver/pkg/authorization/authorizer"
)
// alwaysAllowAuthorizer is an implementation of authorizer.Attributes

2
pkg/genericapiserver/authorizer/delegating.go
View File

@@ -19,7 +19,7 @@ package authorizer
import (
"time"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/apiserver/pkg/authorization/authorizer"
authorizationclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1"
webhooksar "k8s.io/kubernetes/plugin/pkg/auth/authorizer/webhook"
)

6
pkg/genericapiserver/config.go
View File

@@ -36,12 +36,13 @@ import (
"github.com/pborman/uuid"
"gopkg.in/natefinch/lumberjack.v2"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/apiserver/pkg/healthz"
"k8s.io/kubernetes/pkg/admission"
"k8s.io/kubernetes/pkg/api"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/auth/authenticator"
"k8s.io/kubernetes/pkg/auth/authorizer"
authorizerunion "k8s.io/kubernetes/pkg/auth/authorizer/union"
authhandlers "k8s.io/kubernetes/pkg/auth/handlers"
"k8s.io/kubernetes/pkg/client/restclient"
@@ -55,7 +56,6 @@ import (
openapicommon "k8s.io/kubernetes/pkg/genericapiserver/openapi/common"
"k8s.io/kubernetes/pkg/genericapiserver/options"
"k8s.io/kubernetes/pkg/genericapiserver/routes"
"k8s.io/kubernetes/pkg/healthz"
"k8s.io/kubernetes/pkg/runtime"
certutil "k8s.io/kubernetes/pkg/util/cert"
"k8s.io/kubernetes/pkg/util/sets"

2
pkg/genericapiserver/genericapiserver.go
View File

@@ -30,6 +30,7 @@ import (
"github.com/emicklei/go-restful/swagger"
"github.com/golang/glog"
"k8s.io/apiserver/pkg/healthz"
"k8s.io/kubernetes/pkg/admission"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/rest"
@@ -42,7 +43,6 @@ import (
genericmux "k8s.io/kubernetes/pkg/genericapiserver/mux"
openapicommon "k8s.io/kubernetes/pkg/genericapiserver/openapi/common"
"k8s.io/kubernetes/pkg/genericapiserver/routes"
"k8s.io/kubernetes/pkg/healthz"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/schema"
utilnet "k8s.io/kubernetes/pkg/util/net"

2
pkg/genericapiserver/genericapiserver_test.go
View File

@@ -28,6 +28,7 @@ import (
"testing"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/api/rest"
@@ -36,7 +37,6 @@ import (
"k8s.io/kubernetes/pkg/apimachinery"
"k8s.io/kubernetes/pkg/apis/extensions"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/auth/authorizer"
openapigen "k8s.io/kubernetes/pkg/generated/openapi"
genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request"
"k8s.io/kubernetes/pkg/runtime"

2
pkg/genericapiserver/healthz.go
View File

@@ -19,7 +19,7 @@ package genericapiserver
import (
"fmt"
"k8s.io/kubernetes/pkg/healthz"
"k8s.io/apiserver/pkg/healthz"
)
// AddHealthzCheck allows you to add a HealthzCheck.

2
pkg/genericapiserver/hooks.go
View File

@@ -23,8 +23,8 @@ import (
"github.com/golang/glog"
"k8s.io/apiserver/pkg/healthz"
"k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/healthz"
utilruntime "k8s.io/kubernetes/pkg/util/runtime"
)

4
pkg/kubeapiserver/admission/BUILD
View File

@@ -15,7 +15,7 @@ go_test(
tags = ["automanaged"],
deps = [
"//pkg/admission:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
],
)
@@ -25,8 +25,8 @@ go_library(
tags = ["automanaged"],
deps = [
"//pkg/admission:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//pkg/client/clientset_generated/internalclientset:go_default_library",
"//pkg/controller/informers:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
],
)

2
pkg/kubeapiserver/admission/init_test.go
View File

@@ -19,8 +19,8 @@ package admission
import (
"testing"
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/kubernetes/pkg/admission"
"k8s.io/kubernetes/pkg/auth/authorizer"
)
// TestAuthorizer is a testing struct for testing that fulfills the authorizer interface.

2
pkg/kubeapiserver/admission/initializer.go
View File

@@ -17,8 +17,8 @@ limitations under the License.
package admission
import (
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/kubernetes/pkg/admission"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
"k8s.io/kubernetes/pkg/controller/informers"
)

2
pkg/kubeapiserver/authenticator/BUILD
View File

@@ -12,7 +12,6 @@ go_library(
srcs = ["config.go"],
tags = ["automanaged"],
deps = [
"//pkg/auth/authenticator:go_default_library",
"//pkg/auth/authenticator/bearertoken:go_default_library",
"//pkg/auth/group:go_default_library",
"//pkg/genericapiserver/authenticator:go_default_library",
@@ -30,6 +29,7 @@ go_library(
"//plugin/pkg/auth/authenticator/token/tokenfile:go_default_library",
"//plugin/pkg/auth/authenticator/token/webhook:go_default_library",
"//vendor:github.com/go-openapi/spec",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
],
)

2
pkg/kubeapiserver/authenticator/config.go
View File

@@ -21,8 +21,8 @@ import (
"github.com/go-openapi/spec"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/kubernetes/pkg/auth/authenticator"
"k8s.io/kubernetes/pkg/auth/authenticator/bearertoken"
"k8s.io/kubernetes/pkg/auth/group"
genericauthenticator "k8s.io/kubernetes/pkg/genericapiserver/authenticator"

2
pkg/kubeapiserver/authorizer/BUILD
View File

@@ -23,12 +23,12 @@ go_library(
srcs = ["config.go"],
tags = ["automanaged"],
deps = [
"//pkg/auth/authorizer:go_default_library",
"//pkg/auth/authorizer/abac:go_default_library",
"//pkg/auth/authorizer/union:go_default_library",
"//pkg/controller/informers:go_default_library",
"//pkg/genericapiserver/authorizer:go_default_library",
"//plugin/pkg/auth/authorizer/rbac:go_default_library",
"//plugin/pkg/auth/authorizer/webhook:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
],
)

2
pkg/kubeapiserver/authorizer/config.go
View File

@@ -21,7 +21,7 @@ import (
"fmt"
"time"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/kubernetes/pkg/auth/authorizer/abac"
"k8s.io/kubernetes/pkg/auth/authorizer/union"
"k8s.io/kubernetes/pkg/controller/informers"

10
pkg/kubelet/server/BUILD
View File

@@ -22,9 +22,6 @@ go_library(
"//pkg/api/v1:go_default_library",
"//pkg/api/v1/validation:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//pkg/auth/authenticator:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//pkg/healthz:go_default_library",
"//pkg/httplog:go_default_library",
"//pkg/kubelet/cm:go_default_library",
"//pkg/kubelet/container:go_default_library",
@@ -36,7 +33,6 @@ go_library(
"//pkg/runtime/schema:go_default_library",
"//pkg/types:go_default_library",
"//pkg/util/configz:go_default_library",
"//pkg/util/flushwriter:go_default_library",
"//pkg/util/limitwriter:go_default_library",
"//pkg/util/runtime:go_default_library",
"//pkg/util/term:go_default_library",
@@ -46,7 +42,11 @@ go_library(
"//vendor:github.com/google/cadvisor/info/v1",
"//vendor:github.com/google/cadvisor/info/v2",
"//vendor:github.com/prometheus/client_golang/prometheus",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
"//vendor:k8s.io/apiserver/pkg/healthz",
"//vendor:k8s.io/apiserver/pkg/util/flushwriter",
],
)
@@ -62,7 +62,6 @@ go_test(
"//pkg/api:go_default_library",
"//pkg/api/errors:go_default_library",
"//pkg/api/v1:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//pkg/kubelet/cm:go_default_library",
"//pkg/kubelet/container:go_default_library",
"//pkg/kubelet/container/testing:go_default_library",
@@ -81,5 +80,6 @@ go_test(
"//vendor:github.com/stretchr/testify/assert",
"//vendor:github.com/stretchr/testify/require",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
],
)

4
pkg/kubelet/server/auth.go
View File

@@ -21,9 +21,9 @@ import (
"strings"
"github.com/golang/glog"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/kubernetes/pkg/auth/authenticator"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/kubernetes/pkg/types"
)

8
pkg/kubelet/server/server.go
View File

@@ -35,14 +35,15 @@ import (
cadvisorapiv2 "github.com/google/cadvisor/info/v2"
"github.com/prometheus/client_golang/prometheus"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/apiserver/pkg/healthz"
"k8s.io/apiserver/pkg/util/flushwriter"
"k8s.io/kubernetes/pkg/api"
apierrs "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/api/v1/validation"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/auth/authenticator"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/kubernetes/pkg/healthz"
"k8s.io/kubernetes/pkg/httplog"
"k8s.io/kubernetes/pkg/kubelet/cm"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
@@ -54,7 +55,6 @@ import (
"k8s.io/kubernetes/pkg/runtime/schema"
"k8s.io/kubernetes/pkg/types"
"k8s.io/kubernetes/pkg/util/configz"
"k8s.io/kubernetes/pkg/util/flushwriter"
"k8s.io/kubernetes/pkg/util/limitwriter"
utilruntime "k8s.io/kubernetes/pkg/util/runtime"
"k8s.io/kubernetes/pkg/util/term"

2
pkg/kubelet/server/server_test.go
View File

@@ -39,10 +39,10 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/kubernetes/pkg/api"
apierrs "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/kubernetes/pkg/kubelet/cm"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
kubecontainertesting "k8s.io/kubernetes/pkg/kubelet/container/testing"

2
pkg/master/BUILD
View File

@@ -52,7 +52,6 @@ go_library(
"//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library",
"//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library",
"//pkg/genericapiserver:go_default_library",
"//pkg/healthz:go_default_library",
"//pkg/kubelet/client:go_default_library",
"//pkg/master/thirdparty:go_default_library",
"//pkg/registry/apps/rest:go_default_library",
@@ -82,6 +81,7 @@ go_library(
"//pkg/util/wait:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:github.com/prometheus/client_golang/prometheus",
"//vendor:k8s.io/apiserver/pkg/healthz",
],
)

2
pkg/master/master.go
View File

@@ -24,6 +24,7 @@ import (
"strconv"
"time"
"k8s.io/apiserver/pkg/healthz"
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
"k8s.io/kubernetes/pkg/api"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
@@ -40,7 +41,6 @@ import (
corev1client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1"
coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
"k8s.io/kubernetes/pkg/genericapiserver"
"k8s.io/kubernetes/pkg/healthz"
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
"k8s.io/kubernetes/pkg/master/thirdparty"
"k8s.io/kubernetes/pkg/registry/generic"

2
pkg/registry/authentication/rest/BUILD
View File

@@ -15,9 +15,9 @@ go_library(
"//pkg/api/rest:go_default_library",
"//pkg/apis/authentication:go_default_library",
"//pkg/apis/authentication/v1beta1:go_default_library",
"//pkg/auth/authenticator:go_default_library",
"//pkg/genericapiserver:go_default_library",
"//pkg/registry/authentication/tokenreview:go_default_library",
"//pkg/registry/generic:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
],
)

2
pkg/registry/authentication/rest/storage_authentication.go
View File

@@ -17,10 +17,10 @@ limitations under the License.
package rest
import (
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/kubernetes/pkg/api/rest"
"k8s.io/kubernetes/pkg/apis/authentication"
authenticationv1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1"
"k8s.io/kubernetes/pkg/auth/authenticator"
"k8s.io/kubernetes/pkg/genericapiserver"
"k8s.io/kubernetes/pkg/registry/authentication/tokenreview"
"k8s.io/kubernetes/pkg/registry/generic"

2
pkg/registry/authentication/tokenreview/BUILD
View File

@@ -14,8 +14,8 @@ go_library(
deps = [
"//pkg/api/errors:go_default_library",
"//pkg/apis/authentication:go_default_library",
"//pkg/auth/authenticator:go_default_library",
"//pkg/genericapiserver/api/request:go_default_library",
"//pkg/runtime:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
],
)

2
pkg/registry/authentication/tokenreview/storage.go
View File

@@ -20,9 +20,9 @@ import (
"fmt"
"net/http"
"k8s.io/apiserver/pkg/authentication/authenticator"
apierrors "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/apis/authentication"
"k8s.io/kubernetes/pkg/auth/authenticator"
genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request"
"k8s.io/kubernetes/pkg/runtime"
)

2
pkg/registry/authorization/localsubjectaccessreview/BUILD
View File

@@ -15,9 +15,9 @@ go_library(
"//pkg/api/errors:go_default_library",
"//pkg/apis/authorization:go_default_library",
"//pkg/apis/authorization/validation:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//pkg/genericapiserver/api/request:go_default_library",
"//pkg/registry/authorization/util:go_default_library",
"//pkg/runtime:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
],
)

2
pkg/registry/authorization/localsubjectaccessreview/rest.go
View File

@@ -19,10 +19,10 @@ package localsubjectaccessreview
import (
"fmt"
"k8s.io/apiserver/pkg/authorization/authorizer"
kapierrors "k8s.io/kubernetes/pkg/api/errors"
authorizationapi "k8s.io/kubernetes/pkg/apis/authorization"
authorizationvalidation "k8s.io/kubernetes/pkg/apis/authorization/validation"
"k8s.io/kubernetes/pkg/auth/authorizer"
genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request"
authorizationutil "k8s.io/kubernetes/pkg/registry/authorization/util"
"k8s.io/kubernetes/pkg/runtime"

2
pkg/registry/authorization/rest/BUILD
View File

@@ -15,11 +15,11 @@ go_library(
"//pkg/api/rest:go_default_library",
"//pkg/apis/authorization:go_default_library",
"//pkg/apis/authorization/v1beta1:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//pkg/genericapiserver:go_default_library",
"//pkg/registry/authorization/localsubjectaccessreview:go_default_library",
"//pkg/registry/authorization/selfsubjectaccessreview:go_default_library",
"//pkg/registry/authorization/subjectaccessreview:go_default_library",
"//pkg/registry/generic:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
],
)

2
pkg/registry/authorization/rest/storage_authorization.go
View File

@@ -17,10 +17,10 @@ limitations under the License.
package rest
import (
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/kubernetes/pkg/api/rest"
"k8s.io/kubernetes/pkg/apis/authorization"
authorizationv1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/kubernetes/pkg/genericapiserver"
"k8s.io/kubernetes/pkg/registry/authorization/localsubjectaccessreview"
"k8s.io/kubernetes/pkg/registry/authorization/selfsubjectaccessreview"

2
pkg/registry/authorization/selfsubjectaccessreview/BUILD
View File

@@ -15,9 +15,9 @@ go_library(
"//pkg/api/errors:go_default_library",
"//pkg/apis/authorization:go_default_library",
"//pkg/apis/authorization/validation:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//pkg/genericapiserver/api/request:go_default_library",
"//pkg/registry/authorization/util:go_default_library",
"//pkg/runtime:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
],
)

2
pkg/registry/authorization/selfsubjectaccessreview/rest.go
View File

@@ -19,10 +19,10 @@ package selfsubjectaccessreview
import (
"fmt"
"k8s.io/apiserver/pkg/authorization/authorizer"
apierrors "k8s.io/kubernetes/pkg/api/errors"
authorizationapi "k8s.io/kubernetes/pkg/apis/authorization"
authorizationvalidation "k8s.io/kubernetes/pkg/apis/authorization/validation"
"k8s.io/kubernetes/pkg/auth/authorizer"
genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request"
authorizationutil "k8s.io/kubernetes/pkg/registry/authorization/util"
"k8s.io/kubernetes/pkg/runtime"

2
pkg/registry/authorization/subjectaccessreview/BUILD
View File

@@ -15,9 +15,9 @@ go_library(
"//pkg/api/errors:go_default_library",
"//pkg/apis/authorization:go_default_library",
"//pkg/apis/authorization/validation:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//pkg/genericapiserver/api/request:go_default_library",
"//pkg/registry/authorization/util:go_default_library",
"//pkg/runtime:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
],
)

2
pkg/registry/authorization/subjectaccessreview/rest.go
View File

@@ -19,10 +19,10 @@ package subjectaccessreview
import (
"fmt"
"k8s.io/apiserver/pkg/authorization/authorizer"
kapierrors "k8s.io/kubernetes/pkg/api/errors"
authorizationapi "k8s.io/kubernetes/pkg/apis/authorization"
authorizationvalidation "k8s.io/kubernetes/pkg/apis/authorization/validation"
"k8s.io/kubernetes/pkg/auth/authorizer"
genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request"
authorizationutil "k8s.io/kubernetes/pkg/registry/authorization/util"
"k8s.io/kubernetes/pkg/runtime"

2
pkg/registry/authorization/util/BUILD
View File

@@ -13,7 +13,7 @@ go_library(
tags = ["automanaged"],
deps = [
"//pkg/apis/authorization:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
],
)

2
pkg/registry/authorization/util/helpers.go
View File

@@ -18,8 +18,8 @@ package util
import (
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/authorization/authorizer"
authorizationapi "k8s.io/kubernetes/pkg/apis/authorization"
"k8s.io/kubernetes/pkg/auth/authorizer"
)
// ResourceAttributesFrom combines the API object information and the user.Info from the context to build a full authorizer.AttributesRecord for resource access

16
pkg/serviceaccount/BUILD
View File

@@ -8,6 +8,13 @@ load(
"go_test",
)
go_test(
name = "go_default_test",
srcs = ["util_test.go"],
library = ":go_default_library",
tags = ["automanaged"],
)
go_library(
name = "go_default_library",
srcs = [
@@ -19,20 +26,13 @@ go_library(
"//pkg/api:go_default_library",
"//pkg/api/v1:go_default_library",
"//pkg/api/validation/genericvalidation:go_default_library",
"//pkg/auth/authenticator:go_default_library",
"//vendor:github.com/dgrijalva/jwt-go",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
],
)
go_test(
name = "go_default_test",
srcs = ["util_test.go"],
library = ":go_default_library",
tags = ["automanaged"],
)
go_test(
name = "go_default_xtest",
srcs = ["jwt_test.go"],

2
pkg/serviceaccount/jwt.go
View File

@@ -26,9 +26,9 @@ import (
"fmt"
"io/ioutil"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/auth/authenticator"
jwt "github.com/dgrijalva/jwt-go"
"github.com/golang/glog"

2
plugin/cmd/kube-scheduler/app/BUILD
View File

@@ -20,7 +20,6 @@ go_library(
"//pkg/client/record:go_default_library",
"//pkg/client/restclient:go_default_library",
"//pkg/client/unversioned/clientcmd:go_default_library",
"//pkg/healthz:go_default_library",
"//pkg/runtime:go_default_library",
"//pkg/util/configz:go_default_library",
"//plugin/cmd/kube-scheduler/app/options:go_default_library",
@@ -33,5 +32,6 @@ go_library(
"//vendor:github.com/prometheus/client_golang/prometheus",
"//vendor:github.com/spf13/cobra",
"//vendor:github.com/spf13/pflag",
"//vendor:k8s.io/apiserver/pkg/healthz",
],
)

2
plugin/cmd/kube-scheduler/app/server.go
View File

@@ -27,6 +27,7 @@ import (
goruntime "runtime"
"strconv"
"k8s.io/apiserver/pkg/healthz"
"k8s.io/kubernetes/pkg/api/v1"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
v1core "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1"
@@ -35,7 +36,6 @@ import (
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
"k8s.io/kubernetes/pkg/healthz"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/configz"
"k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/options"

4
plugin/pkg/admission/gc/BUILD
View File

@@ -16,8 +16,8 @@ go_library(
"//pkg/admission:go_default_library",
"//pkg/api:go_default_library",
"//pkg/api/meta:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//pkg/runtime:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
],
)
@@ -30,9 +30,9 @@ go_test(
"//pkg/admission:go_default_library",
"//pkg/api:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//pkg/runtime:go_default_library",
"//pkg/runtime/schema:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
],
)

2
plugin/pkg/admission/gc/gc_admission.go
View File

@@ -20,10 +20,10 @@ import (
"fmt"
"io"
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/kubernetes/pkg/admission"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/kubernetes/pkg/runtime"
)

2
plugin/pkg/admission/gc/gc_admission_test.go
View File

@@ -20,10 +20,10 @@ import (
"testing"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/kubernetes/pkg/admission"
"k8s.io/kubernetes/pkg/api"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/schema"
)

4
plugin/pkg/admission/security/podsecuritypolicy/BUILD
View File

@@ -18,7 +18,6 @@ go_library(
"//pkg/api/errors:go_default_library",
"//pkg/api/v1:go_default_library",
"//pkg/apis/extensions:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//pkg/client/cache:go_default_library",
"//pkg/client/clientset_generated/internalclientset:go_default_library",
"//pkg/kubeapiserver/admission:go_default_library",
@@ -32,6 +31,7 @@ go_library(
"//pkg/watch:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
],
)
@@ -44,7 +44,6 @@ go_test(
"//pkg/admission:go_default_library",
"//pkg/api:go_default_library",
"//pkg/apis/extensions:go_default_library",
"//pkg/auth/authorizer:go_default_library",
"//pkg/client/cache:go_default_library",
"//pkg/security/apparmor:go_default_library",
"//pkg/security/podsecuritypolicy:go_default_library",
@@ -54,5 +53,6 @@ go_test(
"//pkg/util/sets:go_default_library",
"//vendor:github.com/stretchr/testify/assert",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
"//vendor:k8s.io/apiserver/pkg/authorization/authorizer",
],
)

2
plugin/pkg/admission/security/podsecuritypolicy/admission.go
View File

@@ -24,12 +24,12 @@ import (
"github.com/golang/glog"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/kubernetes/pkg/admission"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
kubeapiserveradmission "k8s.io/kubernetes/pkg/kubeapiserver/admission"

2
plugin/pkg/admission/security/podsecuritypolicy/admission_test.go
View File

@@ -25,10 +25,10 @@ import (
"github.com/stretchr/testify/assert"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/authorization/authorizer"
kadmission "k8s.io/kubernetes/pkg/admission"
kapi "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/security/apparmor"
kpsp "k8s.io/kubernetes/pkg/security/podsecuritypolicy"

2
plugin/pkg/auth/authenticator/password/allow/BUILD
View File

@@ -13,7 +13,7 @@ go_library(
srcs = ["allow.go"],
tags = ["automanaged"],
deps = [
"//pkg/auth/authenticator:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
],
)

2
plugin/pkg/auth/authenticator/password/allow/allow.go
View File

@@ -17,8 +17,8 @@ limitations under the License.
package allow
import (
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/kubernetes/pkg/auth/authenticator"
)
type allowAuthenticator struct{}

4
plugin/pkg/auth/authenticator/request/anonymous/BUILD
View File

@@ -13,7 +13,7 @@ go_library(
srcs = ["anonymous.go"],
tags = ["automanaged"],
deps = [
"//pkg/auth/authenticator:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
],
)
@@ -24,8 +24,8 @@ go_test(
library = ":go_default_library",
tags = ["automanaged"],
deps = [
"//pkg/auth/authenticator:go_default_library",
"//pkg/util/sets:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
],
)

2
plugin/pkg/auth/authenticator/request/anonymous/anonymous.go
View File

@@ -19,8 +19,8 @@ package anonymous
import (
"net/http"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/kubernetes/pkg/auth/authenticator"
)
const (

2
plugin/pkg/auth/authenticator/request/anonymous/anonymous_test.go
View File

@@ -19,8 +19,8 @@ package anonymous
import (
"testing"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/kubernetes/pkg/auth/authenticator"
"k8s.io/kubernetes/pkg/util/sets"
)

4
plugin/pkg/auth/authenticator/request/basicauth/BUILD
View File

@@ -13,7 +13,7 @@ go_library(
srcs = ["basicauth.go"],
tags = ["automanaged"],
deps = [
"//pkg/auth/authenticator:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
],
)
@@ -24,7 +24,7 @@ go_test(
library = ":go_default_library",
tags = ["automanaged"],
deps = [
"//pkg/auth/authenticator:go_default_library",
"//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
"//vendor:k8s.io/apiserver/pkg/authentication/user",
],
)

2
plugin/pkg/auth/authenticator/request/basicauth/basicauth.go
View File

@@ -19,8 +19,8 @@ package basicauth
import (
"net/http"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/kubernetes/pkg/auth/authenticator"
)
// Authenticator authenticates requests using basic auth

2
plugin/pkg/auth/authenticator/request/basicauth/basicauth_test.go
View File

@@ -21,8 +21,8 @@ import (
"net/http"
"testing"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/kubernetes/pkg/auth/authenticator"
)
type testPassword struct {

Some files were not shown because too many files have changed in this diff Show More