From c4cb265e5ca1f1bb72aec26d1c065d91007350ff Mon Sep 17 00:00:00 2001
From: Sally O'Malley <somalley@redhat.com>
Date: Wed, 26 Jun 2019 09:07:26 -0400
Subject: [PATCH] Updates to dependencies including go.mod, go.sum, and BUILD
 files

---
 pkg/kubectl/describe/versioned/BUILD                           | 2 +-
 pkg/kubectl/util/BUILD                                         | 1 -
 staging/src/k8s.io/kubectl/BUILD                               | 1 +
 .../src/k8s.io/kubectl/pkg}/util/resource/BUILD                | 3 ++-
 vendor/modules.txt                                             | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)
 rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/resource/BUILD (84%)

diff --git a/pkg/kubectl/describe/versioned/BUILD b/pkg/kubectl/describe/versioned/BUILD
index c01ce6142ed..5498c96edec 100644
--- a/pkg/kubectl/describe/versioned/BUILD
+++ b/pkg/kubectl/describe/versioned/BUILD
@@ -10,7 +10,6 @@ go_library(
         "//pkg/kubectl/scheme:go_default_library",
         "//pkg/kubectl/util/certificate:go_default_library",
         "//pkg/kubectl/util/fieldpath:go_default_library",
-        "//pkg/kubectl/util/resource: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",
@@ -47,6 +46,7 @@ go_library(
         "//staging/src/k8s.io/kubectl/pkg/util/event: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",
         "//staging/src/k8s.io/kubectl/pkg/util/storage:go_default_library",
         "//vendor/github.com/fatih/camelcase:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
diff --git a/pkg/kubectl/util/BUILD b/pkg/kubectl/util/BUILD
index 130e5d1b8ab..e6bd221c9e4 100644
--- a/pkg/kubectl/util/BUILD
+++ b/pkg/kubectl/util/BUILD
@@ -70,7 +70,6 @@ filegroup(
         "//pkg/kubectl/util/fieldpath:all-srcs",
         "//pkg/kubectl/util/i18n:all-srcs",
         "//pkg/kubectl/util/logs:all-srcs",
-        "//pkg/kubectl/util/resource:all-srcs",
         "//pkg/kubectl/util/slice:all-srcs",
     ],
     tags = ["automanaged"],
diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD
index 8f0094b68ef..0d865cbcc39 100644
--- a/staging/src/k8s.io/kubectl/BUILD
+++ b/staging/src/k8s.io/kubectl/BUILD
@@ -17,6 +17,7 @@ filegroup(
         "//staging/src/k8s.io/kubectl/pkg/util/printers:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util/qos:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util/rbac:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/util/resource:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util/storage:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util/templates:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util/term:all-srcs",
diff --git a/pkg/kubectl/util/resource/BUILD b/staging/src/k8s.io/kubectl/pkg/util/resource/BUILD
similarity index 84%
rename from pkg/kubectl/util/resource/BUILD
rename to staging/src/k8s.io/kubectl/pkg/util/resource/BUILD
index bbbe532b710..84dbe311a65 100644
--- a/pkg/kubectl/util/resource/BUILD
+++ b/staging/src/k8s.io/kubectl/pkg/util/resource/BUILD
@@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["resource.go"],
-    importpath = "k8s.io/kubernetes/pkg/kubectl/util/resource",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util/resource",
+    importpath = "k8s.io/kubectl/pkg/util/resource",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/api/core/v1:go_default_library",
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 0afcb804ed4..417f6297ce0 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1644,6 +1644,7 @@ k8s.io/kubectl/pkg/util/podutils
 k8s.io/kubectl/pkg/util/printers
 k8s.io/kubectl/pkg/util/qos
 k8s.io/kubectl/pkg/util/rbac
+k8s.io/kubectl/pkg/util/resource
 k8s.io/kubectl/pkg/util/storage
 k8s.io/kubectl/pkg/util/templates
 k8s.io/kubectl/pkg/util/term