From 6274ef995f2cb8a609a83e77a96623021e9299a5 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Wed, 19 Jun 2019 17:13:57 -0700 Subject: [PATCH 1/3] Move pkg/kubectl/util/fieldpath to staging --- pkg/kubectl/util/fieldpath/BUILD | 27 ------------------- .../kubectl/pkg}/util/fieldpath/fieldpath.go | 0 2 files changed, 27 deletions(-) delete mode 100644 pkg/kubectl/util/fieldpath/BUILD rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/fieldpath/fieldpath.go (100%) diff --git a/pkg/kubectl/util/fieldpath/BUILD b/pkg/kubectl/util/fieldpath/BUILD deleted file mode 100644 index 188a07d00d4..00000000000 --- a/pkg/kubectl/util/fieldpath/BUILD +++ /dev/null @@ -1,27 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = ["fieldpath.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/util/fieldpath", - visibility = ["//visibility:public"], - deps = [ - "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/util/validation:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], - visibility = ["//visibility:public"], -) diff --git a/pkg/kubectl/util/fieldpath/fieldpath.go b/staging/src/k8s.io/kubectl/pkg/util/fieldpath/fieldpath.go similarity index 100% rename from pkg/kubectl/util/fieldpath/fieldpath.go rename to staging/src/k8s.io/kubectl/pkg/util/fieldpath/fieldpath.go From e3a74bafc898e9c494aa35ac97cb52110ef572fb Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Wed, 19 Jun 2019 17:17:37 -0700 Subject: [PATCH 2/3] Update imports for the files moved to staging --- pkg/kubectl/describe/versioned/describe.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/kubectl/describe/versioned/describe.go b/pkg/kubectl/describe/versioned/describe.go index b86a7296ca3..194175f5a57 100644 --- a/pkg/kubectl/describe/versioned/describe.go +++ b/pkg/kubectl/describe/versioned/describe.go @@ -68,6 +68,7 @@ import ( "k8s.io/kubectl/pkg/util/certificate" deploymentutil "k8s.io/kubectl/pkg/util/deployment" "k8s.io/kubectl/pkg/util/event" + "k8s.io/kubectl/pkg/util/fieldpath" "k8s.io/kubectl/pkg/util/qos" "k8s.io/kubectl/pkg/util/rbac" resourcehelper "k8s.io/kubectl/pkg/util/resource" From c32921672f2927dee73723f0b7a2245e1576b945 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 27 Jun 2019 10:04:16 -0700 Subject: [PATCH 3/3] Update BUILD files --- pkg/kubectl/describe/versioned/BUILD | 2 +- pkg/kubectl/describe/versioned/describe.go | 1 - pkg/kubectl/util/BUILD | 1 - staging/src/k8s.io/kubectl/BUILD | 1 + .../k8s.io/kubectl/pkg/util/fieldpath/BUILD | 28 +++++++++++++++++++ vendor/modules.txt | 1 + 6 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 staging/src/k8s.io/kubectl/pkg/util/fieldpath/BUILD diff --git a/pkg/kubectl/describe/versioned/BUILD b/pkg/kubectl/describe/versioned/BUILD index 06d190db3fb..8fefd4813ed 100644 --- a/pkg/kubectl/describe/versioned/BUILD +++ b/pkg/kubectl/describe/versioned/BUILD @@ -8,7 +8,6 @@ go_library( deps = [ "//pkg/kubectl/describe:go_default_library", "//pkg/kubectl/scheme:go_default_library", - "//pkg/kubectl/util/fieldpath:go_default_library", "//pkg/kubectl/util/slice:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/autoscaling/v1:go_default_library", @@ -44,6 +43,7 @@ go_library( "//staging/src/k8s.io/kubectl/pkg/util/certificate:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/deployment:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/event:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/util/fieldpath:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/qos:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/rbac:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/resource:go_default_library", diff --git a/pkg/kubectl/describe/versioned/describe.go b/pkg/kubectl/describe/versioned/describe.go index 194175f5a57..119946cb1a4 100644 --- a/pkg/kubectl/describe/versioned/describe.go +++ b/pkg/kubectl/describe/versioned/describe.go @@ -75,7 +75,6 @@ import ( 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/fieldpath" "k8s.io/kubernetes/pkg/kubectl/util/slice" ) diff --git a/pkg/kubectl/util/BUILD b/pkg/kubectl/util/BUILD index 71177611279..098352f6b35 100644 --- a/pkg/kubectl/util/BUILD +++ b/pkg/kubectl/util/BUILD @@ -66,7 +66,6 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/kubectl/util/fieldpath:all-srcs", "//pkg/kubectl/util/i18n:all-srcs", "//pkg/kubectl/util/logs:all-srcs", "//pkg/kubectl/util/slice:all-srcs", diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index 7a2d2e34cf3..eb57a39e8eb 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/staging/src/k8s.io/kubectl/BUILD @@ -12,6 +12,7 @@ filegroup( "//staging/src/k8s.io/kubectl/pkg/util/certificate:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/deployment:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/event:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/fieldpath: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", diff --git a/staging/src/k8s.io/kubectl/pkg/util/fieldpath/BUILD b/staging/src/k8s.io/kubectl/pkg/util/fieldpath/BUILD new file mode 100644 index 00000000000..37682adb7ce --- /dev/null +++ b/staging/src/k8s.io/kubectl/pkg/util/fieldpath/BUILD @@ -0,0 +1,28 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = ["fieldpath.go"], + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util/fieldpath", + importpath = "k8s.io/kubectl/pkg/util/fieldpath", + visibility = ["//visibility:public"], + deps = [ + "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/validation:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/vendor/modules.txt b/vendor/modules.txt index c23e85b4925..baae5a21ab0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1639,6 +1639,7 @@ k8s.io/kube-scheduler/config/v1alpha1 k8s.io/kubectl/pkg/util/certificate k8s.io/kubectl/pkg/util/deployment k8s.io/kubectl/pkg/util/event +k8s.io/kubectl/pkg/util/fieldpath k8s.io/kubectl/pkg/util/hash k8s.io/kubectl/pkg/util/interrupt k8s.io/kubectl/pkg/util/podutils