Merge pull request #79201 from damemi/kubectl-rbac

Move pkg/kubectl/util/rbac to staging
This commit is contained in:
Kubernetes Prow Robot 2019-06-25 14:47:28 -07:00 committed by GitHub
commit 70b1c43657
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 24 additions and 26 deletions

View File

@ -19,7 +19,6 @@ go_library(
"//pkg/kubectl/cmd/util:go_default_library",
"//pkg/kubectl/describe/versioned:go_default_library",
"//pkg/kubectl/scheme:go_default_library",
"//pkg/kubectl/util/rbac:go_default_library",
"//pkg/registry/rbac/reconciliation:go_default_library",
"//staging/src/k8s.io/api/authorization/v1:go_default_library",
"//staging/src/k8s.io/api/rbac/v1:go_default_library",
@ -37,6 +36,7 @@ go_library(
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/printers:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/rbac:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library",
"//vendor/github.com/spf13/cobra:go_default_library",
"//vendor/k8s.io/klog:go_default_library",

View File

@ -36,10 +36,10 @@ import (
discovery "k8s.io/client-go/discovery"
authorizationv1client "k8s.io/client-go/kubernetes/typed/authorization/v1"
"k8s.io/kubectl/pkg/util/printers"
rbacutil "k8s.io/kubectl/pkg/util/rbac"
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
describeutil "k8s.io/kubernetes/pkg/kubectl/describe/versioned"
rbacutil "k8s.io/kubernetes/pkg/kubectl/util/rbac"
)
// CanIOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of

View File

@ -12,7 +12,6 @@ go_library(
"//pkg/kubectl/util/event:go_default_library",
"//pkg/kubectl/util/fieldpath:go_default_library",
"//pkg/kubectl/util/qos:go_default_library",
"//pkg/kubectl/util/rbac:go_default_library",
"//pkg/kubectl/util/resource:go_default_library",
"//pkg/kubectl/util/slice:go_default_library",
"//pkg/kubectl/util/storage:go_default_library",
@ -48,6 +47,7 @@ go_library(
"//staging/src/k8s.io/client-go/rest:go_default_library",
"//staging/src/k8s.io/client-go/tools/reference:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/deployment:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/rbac:go_default_library",
"//vendor/github.com/fatih/camelcase:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
],

View File

@ -66,13 +66,13 @@ import (
"k8s.io/client-go/tools/reference"
"k8s.io/klog"
deploymentutil "k8s.io/kubectl/pkg/util/deployment"
"k8s.io/kubectl/pkg/util/rbac"
"k8s.io/kubernetes/pkg/kubectl/describe"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/certificate"
"k8s.io/kubernetes/pkg/kubectl/util/event"
"k8s.io/kubernetes/pkg/kubectl/util/fieldpath"
"k8s.io/kubernetes/pkg/kubectl/util/qos"
"k8s.io/kubernetes/pkg/kubectl/util/rbac"
resourcehelper "k8s.io/kubernetes/pkg/kubectl/util/resource"
"k8s.io/kubernetes/pkg/kubectl/util/slice"
storageutil "k8s.io/kubernetes/pkg/kubectl/util/storage"

View File

@ -27,7 +27,6 @@ go_library(
deps = [
"//pkg/kubectl/generate:go_default_library",
"//pkg/kubectl/util:go_default_library",
"//pkg/kubectl/util/hash:go_default_library",
"//staging/src/k8s.io/api/apps/v1:go_default_library",
"//staging/src/k8s.io/api/apps/v1beta1:go_default_library",
"//staging/src/k8s.io/api/autoscaling/v1:go_default_library",
@ -49,6 +48,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/validation:go_default_library",
"//staging/src/k8s.io/client-go/discovery:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/hash:go_default_library",
],
)

View File

@ -27,9 +27,9 @@ import (
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/validation"
"k8s.io/kubectl/pkg/util/hash"
"k8s.io/kubernetes/pkg/kubectl/generate"
"k8s.io/kubernetes/pkg/kubectl/util"
"k8s.io/kubernetes/pkg/kubectl/util/hash"
)
// ConfigMapGeneratorV1 supports stable generation of a configMap.

View File

@ -26,9 +26,9 @@ import (
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/validation"
"k8s.io/kubectl/pkg/util/hash"
"k8s.io/kubernetes/pkg/kubectl/generate"
"k8s.io/kubernetes/pkg/kubectl/util"
"k8s.io/kubernetes/pkg/kubectl/util/hash"
)
// SecretGeneratorV1 supports stable generation of an opaque secret

View File

@ -23,8 +23,8 @@ import (
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubectl/pkg/util/hash"
"k8s.io/kubernetes/pkg/kubectl/generate"
"k8s.io/kubernetes/pkg/kubectl/util/hash"
)
// SecretForDockerRegistryGeneratorV1 supports stable generation of a docker registry secret

View File

@ -23,8 +23,8 @@ import (
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubectl/pkg/util/hash"
"k8s.io/kubernetes/pkg/kubectl/generate"
"k8s.io/kubernetes/pkg/kubectl/util/hash"
)
// SecretForTLSGeneratorV1 supports stable generation of a TLS secret.

View File

@ -69,11 +69,9 @@ filegroup(
"//pkg/kubectl/util/certificate:all-srcs",
"//pkg/kubectl/util/event:all-srcs",
"//pkg/kubectl/util/fieldpath:all-srcs",
"//pkg/kubectl/util/hash:all-srcs",
"//pkg/kubectl/util/i18n:all-srcs",
"//pkg/kubectl/util/logs:all-srcs",
"//pkg/kubectl/util/qos:all-srcs",
"//pkg/kubectl/util/rbac:all-srcs",
"//pkg/kubectl/util/resource:all-srcs",
"//pkg/kubectl/util/slice:all-srcs",
"//pkg/kubectl/util/storage:all-srcs",

View File

@ -10,9 +10,11 @@ filegroup(
srcs = [
":package-srcs",
"//staging/src/k8s.io/kubectl/pkg/util/deployment:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/util/hash:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/util/interrupt:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/util/podutils:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/util/printers:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/util/rbac:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/util/templates:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/util/term:all-srcs",
],

View File

@ -81,7 +81,6 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@ -112,7 +111,6 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy
gopkg.in/inf.v0 v0.9.0 h1:3zYtXIO92bvsdS3ggAdA8Gb4Azj0YU+TVY1uGYNFA8o=
gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

View File

@ -1,9 +1,12 @@
package(default_visibility = ["//visibility:public"])
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
"go_test",
go_library(
name = "go_default_library",
srcs = ["hash.go"],
importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util/hash",
importpath = "k8s.io/kubectl/pkg/util/hash",
visibility = ["//visibility:public"],
deps = ["//staging/src/k8s.io/api/core/v1:go_default_library"],
)
go_test(
@ -13,13 +16,6 @@ go_test(
deps = ["//staging/src/k8s.io/api/core/v1:go_default_library"],
)
go_library(
name = "go_default_library",
srcs = ["hash.go"],
importpath = "k8s.io/kubernetes/pkg/kubectl/util/hash",
deps = ["//staging/src/k8s.io/api/core/v1:go_default_library"],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
@ -31,4 +27,5 @@ filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
visibility = ["//visibility:public"],
)

View File

@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["rbac.go"],
importpath = "k8s.io/kubernetes/pkg/kubectl/util/rbac",
importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util/rbac",
importpath = "k8s.io/kubectl/pkg/util/rbac",
visibility = ["//visibility:public"],
deps = ["//staging/src/k8s.io/api/rbac/v1:go_default_library"],
)

2
vendor/modules.txt vendored
View File

@ -1636,9 +1636,11 @@ k8s.io/kube-proxy/config/v1alpha1
k8s.io/kube-scheduler/config/v1alpha1
# k8s.io/kubectl v0.0.0 => ./staging/src/k8s.io/kubectl
k8s.io/kubectl/pkg/util/deployment
k8s.io/kubectl/pkg/util/hash
k8s.io/kubectl/pkg/util/interrupt
k8s.io/kubectl/pkg/util/podutils
k8s.io/kubectl/pkg/util/printers
k8s.io/kubectl/pkg/util/rbac
k8s.io/kubectl/pkg/util/templates
k8s.io/kubectl/pkg/util/term
# k8s.io/kubelet v0.0.0 => ./staging/src/k8s.io/kubelet