From 5f7dbefa036582410abb52ae54d0af6dd978904e Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Wed, 19 Jun 2019 23:24:56 -0400 Subject: [PATCH] Move pkg/util/slice and update refs --- pkg/kubectl/describe/versioned/describe.go | 2 +- pkg/kubectl/history.go | 2 +- .../kubectl => staging/src/k8s.io/kubectl/pkg}/util/slice/BUILD | 0 .../src/k8s.io/kubectl/pkg}/util/slice/slice.go | 0 .../src/k8s.io/kubectl/pkg}/util/slice/slice_test.go | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/slice/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/slice/slice.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/slice/slice_test.go (100%) diff --git a/pkg/kubectl/describe/versioned/describe.go b/pkg/kubectl/describe/versioned/describe.go index 119946cb1a4..3fab8ff0362 100644 --- a/pkg/kubectl/describe/versioned/describe.go +++ b/pkg/kubectl/describe/versioned/describe.go @@ -72,10 +72,10 @@ import ( "k8s.io/kubectl/pkg/util/qos" "k8s.io/kubectl/pkg/util/rbac" resourcehelper "k8s.io/kubectl/pkg/util/resource" + "k8s.io/kubectl/pkg/util/slice" storageutil "k8s.io/kubectl/pkg/util/storage" "k8s.io/kubernetes/pkg/kubectl/describe" "k8s.io/kubernetes/pkg/kubectl/scheme" - "k8s.io/kubernetes/pkg/kubectl/util/slice" ) // Each level has 2 spaces for PrefixWriter diff --git a/pkg/kubectl/history.go b/pkg/kubectl/history.go index 382c6dd4463..b6c8e145576 100644 --- a/pkg/kubectl/history.go +++ b/pkg/kubectl/history.go @@ -35,9 +35,9 @@ import ( "k8s.io/client-go/kubernetes" clientappsv1 "k8s.io/client-go/kubernetes/typed/apps/v1" deploymentutil "k8s.io/kubectl/pkg/util/deployment" + sliceutil "k8s.io/kubectl/pkg/util/slice" kapps "k8s.io/kubernetes/pkg/kubectl/apps" describe "k8s.io/kubernetes/pkg/kubectl/describe/versioned" - sliceutil "k8s.io/kubernetes/pkg/kubectl/util/slice" ) const ( diff --git a/pkg/kubectl/util/slice/BUILD b/staging/src/k8s.io/kubectl/pkg/util/slice/BUILD similarity index 100% rename from pkg/kubectl/util/slice/BUILD rename to staging/src/k8s.io/kubectl/pkg/util/slice/BUILD diff --git a/pkg/kubectl/util/slice/slice.go b/staging/src/k8s.io/kubectl/pkg/util/slice/slice.go similarity index 100% rename from pkg/kubectl/util/slice/slice.go rename to staging/src/k8s.io/kubectl/pkg/util/slice/slice.go diff --git a/pkg/kubectl/util/slice/slice_test.go b/staging/src/k8s.io/kubectl/pkg/util/slice/slice_test.go similarity index 100% rename from pkg/kubectl/util/slice/slice_test.go rename to staging/src/k8s.io/kubectl/pkg/util/slice/slice_test.go