From a507ca338ac8f9d609793ace6840a161d99696e9 Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Wed, 19 Jun 2019 23:11:57 -0400 Subject: [PATCH] Move pkg/util/rbac to staging and update refs --- pkg/kubectl/cmd/auth/cani.go | 2 +- pkg/kubectl/describe/versioned/describe.go | 2 +- {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/rbac/BUILD | 0 .../src/k8s.io/kubectl/pkg}/util/rbac/rbac.go | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/rbac/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/rbac/rbac.go (100%) diff --git a/pkg/kubectl/cmd/auth/cani.go b/pkg/kubectl/cmd/auth/cani.go index 3b2d7efe4be..2f1d580afdb 100644 --- a/pkg/kubectl/cmd/auth/cani.go +++ b/pkg/kubectl/cmd/auth/cani.go @@ -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 diff --git a/pkg/kubectl/describe/versioned/describe.go b/pkg/kubectl/describe/versioned/describe.go index b82891bbcbc..532c29092c0 100644 --- a/pkg/kubectl/describe/versioned/describe.go +++ b/pkg/kubectl/describe/versioned/describe.go @@ -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" diff --git a/pkg/kubectl/util/rbac/BUILD b/staging/src/k8s.io/kubectl/pkg/util/rbac/BUILD similarity index 100% rename from pkg/kubectl/util/rbac/BUILD rename to staging/src/k8s.io/kubectl/pkg/util/rbac/BUILD diff --git a/pkg/kubectl/util/rbac/rbac.go b/staging/src/k8s.io/kubectl/pkg/util/rbac/rbac.go similarity index 100% rename from pkg/kubectl/util/rbac/rbac.go rename to staging/src/k8s.io/kubectl/pkg/util/rbac/rbac.go