Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move pkg/kubectl/util/rbac to staging #79201

Merged
merged 5 commits into from
Jun 25, 2019
Merged

Move pkg/kubectl/util/rbac to staging #79201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7aa214d
Move pkg/kubectl/util/hash to staging
seans3 Jun 20, 2019
ff176aa
Update import statements to reference code moved to staging
seans3 Jun 20, 2019
e397b04
Update go.mod, go.sum, and BUILD dependencies
seans3 Jun 20, 2019
a507ca3
Move pkg/util/rbac to staging and update refs
damemi Jun 20, 2019
76d7f58
update vendor
damemi Jun 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/kubectl/cmd/auth/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubectl/cmd/auth/cani.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubectl/describe/versioned/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
],
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubectl/describe/versioned/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubectl/generate/versioned/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
],
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/kubectl/generate/versioned/configmap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubectl/generate/versioned/secret.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubectl/generate/versioned/secret_for_docker_registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubectl/generate/versioned/secret_for_tls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions pkg/kubectl/util/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions staging/src/k8s.io/kubectl/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
2 changes: 0 additions & 2 deletions staging/src/k8s.io/kubectl/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 9 additions & 12 deletions pkg/kubectl/util/hash/BUILD → ...ng/src/k8s.io/kubectl/pkg/util/hash/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand All @@ -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(["**"]),
Expand All @@ -31,4 +27,5 @@ filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
visibility = ["//visibility:public"],
)
0 pkg/kubectl/util/hash/hash.go → .../src/k8s.io/kubectl/pkg/util/hash/hash.go
View file
Open in desktop
File renamed without changes.
0 pkg/kubectl/util/hash/hash_test.go → ...k8s.io/kubectl/pkg/util/hash/hash_test.go
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion pkg/kubectl/util/rbac/BUILD → ...ng/src/k8s.io/kubectl/pkg/util/rbac/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)
Expand Down
0 pkg/kubectl/util/rbac/rbac.go → .../src/k8s.io/kubectl/pkg/util/rbac/rbac.go
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down