From ba95a8c64195a461bdb3cb325185cc127e4060a6 Mon Sep 17 00:00:00 2001 From: Renaud Gaubert Date: Tue, 30 Jun 2020 04:48:11 +0000 Subject: [PATCH] run hack/update-vendor.sh Signed-off-by: Renaud Gaubert --- pkg/kubelet/apis/podresources/BUILD | 9 +++------ pkg/kubelet/cm/BUILD | 2 +- pkg/kubelet/cm/devicemanager/BUILD | 2 +- pkg/kubelet/server/BUILD | 2 +- staging/src/k8s.io/kubelet/BUILD | 1 + .../k8s.io/kubelet/pkg/apis/podresources/v1alpha1/BUILD | 3 ++- test/e2e_node/BUILD | 4 ++-- vendor/modules.txt | 1 + 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/kubelet/apis/podresources/BUILD b/pkg/kubelet/apis/podresources/BUILD index 8bca4b89702..a8c0bf9981a 100644 --- a/pkg/kubelet/apis/podresources/BUILD +++ b/pkg/kubelet/apis/podresources/BUILD @@ -10,9 +10,9 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubelet/apis/podresources", visibility = ["//visibility:public"], deps = [ - "//pkg/kubelet/apis/podresources/v1alpha1:go_default_library", "//pkg/kubelet/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1:go_default_library", "//vendor/google.golang.org/grpc:go_default_library", ], ) @@ -22,10 +22,10 @@ go_test( srcs = ["server_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubelet/apis/podresources/v1alpha1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1:go_default_library", "//vendor/github.com/stretchr/testify/mock:go_default_library", ], ) @@ -39,10 +39,7 @@ filegroup( filegroup( name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/kubelet/apis/podresources/v1alpha1:all-srcs", - ], + srcs = [":package-srcs"], tags = ["automanaged"], visibility = ["//visibility:public"], ) diff --git a/pkg/kubelet/cm/BUILD b/pkg/kubelet/cm/BUILD index 1f03723d9f0..cb04702db5f 100644 --- a/pkg/kubelet/cm/BUILD +++ b/pkg/kubelet/cm/BUILD @@ -26,7 +26,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/features:go_default_library", - "//pkg/kubelet/apis/podresources/v1alpha1:go_default_library", "//pkg/kubelet/cm/cpumanager:go_default_library", "//pkg/kubelet/cm/cpuset:go_default_library", "//pkg/kubelet/cm/topologymanager:go_default_library", @@ -43,6 +42,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", ] + select({ "@io_bazel_rules_go//go/platform:aix": [ diff --git a/pkg/kubelet/cm/devicemanager/BUILD b/pkg/kubelet/cm/devicemanager/BUILD index d79d88f9d09..c49b84eb825 100644 --- a/pkg/kubelet/cm/devicemanager/BUILD +++ b/pkg/kubelet/cm/devicemanager/BUILD @@ -16,7 +16,6 @@ go_library( deps = [ "//pkg/apis/core/v1/helper:go_default_library", "//pkg/features:go_default_library", - "//pkg/kubelet/apis/podresources/v1alpha1:go_default_library", "//pkg/kubelet/checkpointmanager:go_default_library", "//pkg/kubelet/checkpointmanager/errors:go_default_library", "//pkg/kubelet/cm/devicemanager/checkpoint:go_default_library", @@ -36,6 +35,7 @@ go_library( "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1:go_default_library", "//staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1:go_default_library", "//vendor/github.com/google/cadvisor/info/v1:go_default_library", "//vendor/google.golang.org/grpc:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", diff --git a/pkg/kubelet/server/BUILD b/pkg/kubelet/server/BUILD index c50ef5e0aa9..a17e6a90685 100644 --- a/pkg/kubelet/server/BUILD +++ b/pkg/kubelet/server/BUILD @@ -20,7 +20,6 @@ go_library( "//pkg/apis/core/v1/validation:go_default_library", "//pkg/features:go_default_library", "//pkg/kubelet/apis/podresources:go_default_library", - "//pkg/kubelet/apis/podresources/v1alpha1:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/cri/streaming:go_default_library", "//pkg/kubelet/cri/streaming/portforward:go_default_library", @@ -51,6 +50,7 @@ go_library( "//staging/src/k8s.io/component-base/logs:go_default_library", "//staging/src/k8s.io/component-base/metrics:go_default_library", "//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1:go_default_library", "//vendor/github.com/emicklei/go-restful:go_default_library", "//vendor/github.com/google/cadvisor/container:go_default_library", "//vendor/github.com/google/cadvisor/info/v1:go_default_library", diff --git a/staging/src/k8s.io/kubelet/BUILD b/staging/src/k8s.io/kubelet/BUILD index a53827c1f86..9c211f08217 100644 --- a/staging/src/k8s.io/kubelet/BUILD +++ b/staging/src/k8s.io/kubelet/BUILD @@ -15,6 +15,7 @@ filegroup( "//staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1:all-srcs", "//staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1:all-srcs", "//staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1:all-srcs", + "//staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1/BUILD b/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1/BUILD index 40fdd2e2356..f82f61759af 100644 --- a/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1/BUILD +++ b/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["api.pb.go"], - importpath = "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubelet/pkg/apis/podresources/v1alpha1", + importpath = "k8s.io/kubelet/pkg/apis/podresources/v1alpha1", visibility = ["//visibility:public"], deps = [ "//vendor/github.com/gogo/protobuf/gogoproto:go_default_library", diff --git a/test/e2e_node/BUILD b/test/e2e_node/BUILD index 5a3f5d3af09..5c529dd6275 100644 --- a/test/e2e_node/BUILD +++ b/test/e2e_node/BUILD @@ -30,7 +30,6 @@ go_library( "//pkg/features:go_default_library", "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/apis/podresources:go_default_library", - "//pkg/kubelet/apis/podresources/v1alpha1:go_default_library", "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/cm/cpuset:go_default_library", @@ -49,6 +48,7 @@ go_library( "//staging/src/k8s.io/cri-api/pkg/apis:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library", "//staging/src/k8s.io/kubelet/config/v1beta1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1:go_default_library", "//test/e2e/common:go_default_library", "//test/e2e/framework:go_default_library", "//test/e2e/framework/gpu:go_default_library", @@ -155,7 +155,6 @@ go_test( "//pkg/features:go_default_library", "//pkg/kubelet:go_default_library", "//pkg/kubelet/apis/config:go_default_library", - "//pkg/kubelet/apis/podresources/v1alpha1:go_default_library", "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/cm/cpumanager:go_default_library", @@ -196,6 +195,7 @@ go_test( "//staging/src/k8s.io/component-base/metrics/testutil:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1:go_default_library", "//test/e2e/common:go_default_library", "//test/e2e/framework:go_default_library", "//test/e2e/framework/gpu:go_default_library", diff --git a/vendor/modules.txt b/vendor/modules.txt index ac972aa186a..15bb7be8e33 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2357,6 +2357,7 @@ k8s.io/kubectl/pkg/validation k8s.io/kubelet/config/v1beta1 k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1 k8s.io/kubelet/pkg/apis/pluginregistration/v1 +k8s.io/kubelet/pkg/apis/podresources/v1alpha1 # k8s.io/legacy-cloud-providers v0.0.0 => ./staging/src/k8s.io/legacy-cloud-providers ## explicit # k8s.io/legacy-cloud-providers => ./staging/src/k8s.io/legacy-cloud-providers