From a5a6762d33743521e1696113143ea66b3072a224 Mon Sep 17 00:00:00 2001 From: Michael Beaumont Date: Tue, 9 Feb 2021 19:47:42 +0100 Subject: [PATCH] Move pkg/kubelet/apis to k8s.io/kubelet/pkg/apis --- cmd/kubelet/app/options/BUILD | 2 +- cmd/kubelet/app/options/options.go | 2 +- pkg/controller/nodelifecycle/BUILD | 4 +- .../node_lifecycle_controller.go | 2 +- .../node_lifecycle_controller_test.go | 2 +- pkg/kubelet/BUILD | 7 ++-- pkg/kubelet/apis/BUILD | 33 --------------- pkg/kubelet/kubelet_node_status.go | 2 +- pkg/kubelet/kubelet_node_status_test.go | 2 +- plugin/pkg/admission/noderestriction/BUILD | 4 +- .../admission/noderestriction/admission.go | 2 +- .../noderestriction/admission_test.go | 2 +- staging/src/k8s.io/kubelet/BUILD | 10 +---- staging/src/k8s.io/kubelet/pkg/apis/BUILD | 41 +++++++++++++++++++ .../kubelet/pkg}/apis/well_known_labels.go | 0 vendor/modules.txt | 1 + 16 files changed, 59 insertions(+), 57 deletions(-) delete mode 100644 pkg/kubelet/apis/BUILD create mode 100644 staging/src/k8s.io/kubelet/pkg/apis/BUILD rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/well_known_labels.go (100%) diff --git a/cmd/kubelet/app/options/BUILD b/cmd/kubelet/app/options/BUILD index 53932c63591..5c6430b5d39 100644 --- a/cmd/kubelet/app/options/BUILD +++ b/cmd/kubelet/app/options/BUILD @@ -25,7 +25,6 @@ go_library( "//pkg/credentialprovider/azure:go_default_library", "//pkg/credentialprovider/gcp:go_default_library", "//pkg/features:go_default_library", - "//pkg/kubelet/apis:go_default_library", "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/apis/config/scheme:go_default_library", "//pkg/kubelet/apis/config/validation:go_default_library", @@ -40,6 +39,7 @@ go_library( "//staging/src/k8s.io/component-base/logs:go_default_library", "//staging/src/k8s.io/component-base/version/verflag:go_default_library", "//staging/src/k8s.io/kubelet/config/v1beta1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", ] + select({ diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index 7dc63dbe743..5b4f705cf98 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -31,10 +31,10 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" cliflag "k8s.io/component-base/cli/flag" "k8s.io/kubelet/config/v1beta1" + kubeletapis "k8s.io/kubelet/pkg/apis" "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/cluster/ports" "k8s.io/kubernetes/pkg/features" - kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/config/scheme" kubeletconfigvalidation "k8s.io/kubernetes/pkg/kubelet/apis/config/validation" diff --git a/pkg/controller/nodelifecycle/BUILD b/pkg/controller/nodelifecycle/BUILD index 72cfe1738b3..40dba21ac3c 100644 --- a/pkg/controller/nodelifecycle/BUILD +++ b/pkg/controller/nodelifecycle/BUILD @@ -12,7 +12,6 @@ go_library( "//pkg/controller:go_default_library", "//pkg/controller/nodelifecycle/scheduler:go_default_library", "//pkg/controller/util/node:go_default_library", - "//pkg/kubelet/apis:go_default_library", "//pkg/util/node:go_default_library", "//pkg/util/taints:go_default_library", "//staging/src/k8s.io/api/coordination/v1:go_default_library", @@ -39,6 +38,7 @@ go_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/component-base/metrics/prometheus/ratelimiter:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", ], ) @@ -52,7 +52,6 @@ go_test( "//pkg/controller/nodelifecycle/scheduler:go_default_library", "//pkg/controller/testutil:go_default_library", "//pkg/controller/util/node:go_default_library", - "//pkg/kubelet/apis:go_default_library", "//pkg/util/node:go_default_library", "//pkg/util/taints:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", @@ -72,6 +71,7 @@ go_test( "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library", "//staging/src/k8s.io/client-go/testing:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis:go_default_library", "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/controller/nodelifecycle/node_lifecycle_controller.go b/pkg/controller/nodelifecycle/node_lifecycle_controller.go index 5201fe0a9d4..beab0128e86 100644 --- a/pkg/controller/nodelifecycle/node_lifecycle_controller.go +++ b/pkg/controller/nodelifecycle/node_lifecycle_controller.go @@ -51,10 +51,10 @@ import ( "k8s.io/client-go/util/flowcontrol" "k8s.io/client-go/util/workqueue" "k8s.io/component-base/metrics/prometheus/ratelimiter" + kubeletapis "k8s.io/kubelet/pkg/apis" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/nodelifecycle/scheduler" nodeutil "k8s.io/kubernetes/pkg/controller/util/node" - kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" utilnode "k8s.io/kubernetes/pkg/util/node" taintutils "k8s.io/kubernetes/pkg/util/taints" ) diff --git a/pkg/controller/nodelifecycle/node_lifecycle_controller_test.go b/pkg/controller/nodelifecycle/node_lifecycle_controller_test.go index b09566cd646..a2a9060629d 100644 --- a/pkg/controller/nodelifecycle/node_lifecycle_controller_test.go +++ b/pkg/controller/nodelifecycle/node_lifecycle_controller_test.go @@ -40,11 +40,11 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" testcore "k8s.io/client-go/testing" + kubeletapis "k8s.io/kubelet/pkg/apis" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/nodelifecycle/scheduler" "k8s.io/kubernetes/pkg/controller/testutil" nodeutil "k8s.io/kubernetes/pkg/controller/util/node" - kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" "k8s.io/kubernetes/pkg/util/node" taintutils "k8s.io/kubernetes/pkg/util/taints" "k8s.io/utils/pointer" diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index 7cec3c660ee..849cb42a472 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -43,7 +43,6 @@ go_library( "//pkg/apis/core/v1/helper/qos:go_default_library", "//pkg/features:go_default_library", "//pkg/fieldpath:go_default_library", - "//pkg/kubelet/apis:go_default_library", "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/apis/podresources:go_default_library", "//pkg/kubelet/cadvisor:go_default_library", @@ -144,6 +143,7 @@ go_library( "//staging/src/k8s.io/component-helpers/apimachinery/lease: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:go_default_library", "//staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1:go_default_library", "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", "//staging/src/k8s.io/mount-utils:go_default_library", @@ -194,7 +194,6 @@ go_test( deps = [ "//pkg/apis/core/install:go_default_library", "//pkg/features:go_default_library", - "//pkg/kubelet/apis:go_default_library", "//pkg/kubelet/cadvisor/testing:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/config:go_default_library", @@ -262,6 +261,7 @@ go_test( "//staging/src/k8s.io/client-go/util/testing:go_default_library", "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library", "//staging/src/k8s.io/component-base/version:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis:go_default_library", "//staging/src/k8s.io/mount-utils:go_default_library", "//vendor/github.com/golang/groupcache/lru:go_default_library", "//vendor/github.com/google/cadvisor/info/v1:go_default_library", @@ -290,7 +290,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/kubelet/apis:all-srcs", + "//pkg/kubelet/apis/config:all-srcs", + "//pkg/kubelet/apis/podresources:all-srcs", "//pkg/kubelet/cadvisor:all-srcs", "//pkg/kubelet/certificate:all-srcs", "//pkg/kubelet/checkpointmanager:all-srcs", diff --git a/pkg/kubelet/apis/BUILD b/pkg/kubelet/apis/BUILD deleted file mode 100644 index 3067d54b40f..00000000000 --- a/pkg/kubelet/apis/BUILD +++ /dev/null @@ -1,33 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["well_known_labels.go"], - importpath = "k8s.io/kubernetes/pkg/kubelet/apis", - deps = [ - "//staging/src/k8s.io/api/core/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/kubelet/apis/config:all-srcs", - "//pkg/kubelet/apis/podresources:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/pkg/kubelet/kubelet_node_status.go b/pkg/kubelet/kubelet_node_status.go index 0e48875a5d3..c4f72bfb22c 100644 --- a/pkg/kubelet/kubelet_node_status.go +++ b/pkg/kubelet/kubelet_node_status.go @@ -35,9 +35,9 @@ import ( cloudprovider "k8s.io/cloud-provider" cloudproviderapi "k8s.io/cloud-provider/api" "k8s.io/klog/v2" + kubeletapis "k8s.io/kubelet/pkg/apis" k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" - kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" "k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/kubelet/nodestatus" "k8s.io/kubernetes/pkg/kubelet/util" diff --git a/pkg/kubelet/kubelet_node_status_test.go b/pkg/kubelet/kubelet_node_status_test.go index d5309992946..aa9c56b6d38 100644 --- a/pkg/kubelet/kubelet_node_status_test.go +++ b/pkg/kubelet/kubelet_node_status_test.go @@ -49,7 +49,7 @@ import ( "k8s.io/client-go/rest" core "k8s.io/client-go/testing" "k8s.io/component-base/version" - kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" + kubeletapis "k8s.io/kubelet/pkg/apis" cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/plugin/pkg/admission/noderestriction/BUILD b/plugin/pkg/admission/noderestriction/BUILD index 3e602e60ad3..27461ca7d96 100644 --- a/plugin/pkg/admission/noderestriction/BUILD +++ b/plugin/pkg/admission/noderestriction/BUILD @@ -19,7 +19,6 @@ go_library( "//pkg/apis/storage:go_default_library", "//pkg/auth/nodeidentifier:go_default_library", "//pkg/features:go_default_library", - "//pkg/kubelet/apis:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", @@ -32,6 +31,7 @@ go_library( "//staging/src/k8s.io/client-go/informers:go_default_library", "//staging/src/k8s.io/client-go/listers/core/v1:go_default_library", "//staging/src/k8s.io/component-base/featuregate:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis:go_default_library", ], ) @@ -46,7 +46,6 @@ go_test( "//pkg/apis/policy:go_default_library", "//pkg/apis/storage:go_default_library", "//pkg/auth/nodeidentifier:go_default_library", - "//pkg/kubelet/apis: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/runtime/schema:go_default_library", @@ -57,6 +56,7 @@ go_test( "//staging/src/k8s.io/client-go/listers/core/v1:go_default_library", "//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//staging/src/k8s.io/component-base/featuregate:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis:go_default_library", "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/plugin/pkg/admission/noderestriction/admission.go b/plugin/pkg/admission/noderestriction/admission.go index 8d4edde256d..1e01f32f69e 100644 --- a/plugin/pkg/admission/noderestriction/admission.go +++ b/plugin/pkg/admission/noderestriction/admission.go @@ -34,6 +34,7 @@ import ( "k8s.io/client-go/informers" corev1lister "k8s.io/client-go/listers/core/v1" "k8s.io/component-base/featuregate" + kubeletapis "k8s.io/kubelet/pkg/apis" podutil "k8s.io/kubernetes/pkg/api/pod" authenticationapi "k8s.io/kubernetes/pkg/apis/authentication" coordapi "k8s.io/kubernetes/pkg/apis/coordination" @@ -42,7 +43,6 @@ import ( storage "k8s.io/kubernetes/pkg/apis/storage" "k8s.io/kubernetes/pkg/auth/nodeidentifier" "k8s.io/kubernetes/pkg/features" - kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" ) // PluginName is a string with the name of the plugin diff --git a/plugin/pkg/admission/noderestriction/admission_test.go b/plugin/pkg/admission/noderestriction/admission_test.go index e897e55221c..0ac8809d50a 100644 --- a/plugin/pkg/admission/noderestriction/admission_test.go +++ b/plugin/pkg/admission/noderestriction/admission_test.go @@ -33,13 +33,13 @@ import ( corev1lister "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/component-base/featuregate" + kubeletapis "k8s.io/kubelet/pkg/apis" authenticationapi "k8s.io/kubernetes/pkg/apis/authentication" "k8s.io/kubernetes/pkg/apis/coordination" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/policy" storage "k8s.io/kubernetes/pkg/apis/storage" "k8s.io/kubernetes/pkg/auth/nodeidentifier" - kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" "k8s.io/utils/pointer" ) diff --git a/staging/src/k8s.io/kubelet/BUILD b/staging/src/k8s.io/kubelet/BUILD index 76a7c6f2fb3..fc75da12b8b 100644 --- a/staging/src/k8s.io/kubelet/BUILD +++ b/staging/src/k8s.io/kubelet/BUILD @@ -11,15 +11,7 @@ filegroup( ":package-srcs", "//staging/src/k8s.io/kubelet/config/v1alpha1:all-srcs", "//staging/src/k8s.io/kubelet/config/v1beta1:all-srcs", - "//staging/src/k8s.io/kubelet/pkg/apis/credentialprovider:all-srcs", - "//staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha:all-srcs", - "//staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1:all-srcs", - "//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/v1:all-srcs", - "//staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1:all-srcs", - "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:all-srcs", + "//staging/src/k8s.io/kubelet/pkg/apis:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/staging/src/k8s.io/kubelet/pkg/apis/BUILD b/staging/src/k8s.io/kubelet/pkg/apis/BUILD new file mode 100644 index 00000000000..aa26c1d9d0d --- /dev/null +++ b/staging/src/k8s.io/kubelet/pkg/apis/BUILD @@ -0,0 +1,41 @@ +package(default_visibility = ["//visibility:public"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_library", +) + +go_library( + name = "go_default_library", + srcs = ["well_known_labels.go"], + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubelet/pkg/apis", + importpath = "k8s.io/kubelet/pkg/apis", + deps = [ + "//staging/src/k8s.io/api/core/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [ + ":package-srcs", + "//staging/src/k8s.io/kubelet/pkg/apis/credentialprovider:all-srcs", + "//staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha:all-srcs", + "//staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1:all-srcs", + "//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/v1:all-srcs", + "//staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1:all-srcs", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:all-srcs", + ], + tags = ["automanaged"], +) diff --git a/pkg/kubelet/apis/well_known_labels.go b/staging/src/k8s.io/kubelet/pkg/apis/well_known_labels.go similarity index 100% rename from pkg/kubelet/apis/well_known_labels.go rename to staging/src/k8s.io/kubelet/pkg/apis/well_known_labels.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 4fdc2b69d51..f13955da7fb 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2445,6 +2445,7 @@ k8s.io/kubectl/pkg/validation # k8s.io/kubelet => ./staging/src/k8s.io/kubelet k8s.io/kubelet/config/v1alpha1 k8s.io/kubelet/config/v1beta1 +k8s.io/kubelet/pkg/apis k8s.io/kubelet/pkg/apis/credentialprovider k8s.io/kubelet/pkg/apis/credentialprovider/install k8s.io/kubelet/pkg/apis/credentialprovider/v1alpha1