From 7d309e0104fedb57280b261e5677d919cb2a0e2d Mon Sep 17 00:00:00 2001 From: Marek Siarkowicz Date: Sat, 11 Jul 2020 12:59:52 +0200 Subject: [PATCH] Move Kubelet Summary API to staging repo --- hack/.import-aliases | 2 +- pkg/kubelet/apis/BUILD | 1 - pkg/kubelet/eviction/BUILD | 4 +-- pkg/kubelet/eviction/eviction_manager.go | 2 +- pkg/kubelet/eviction/eviction_manager_test.go | 2 +- pkg/kubelet/eviction/helpers.go | 2 +- pkg/kubelet/eviction/helpers_test.go | 2 +- .../eviction/memory_threshold_notifier.go | 2 +- .../memory_threshold_notifier_test.go | 2 +- .../eviction/mock_threshold_notifier_test.go | 2 +- pkg/kubelet/eviction/types.go | 2 +- pkg/kubelet/images/BUILD | 4 +-- pkg/kubelet/images/image_gc_manager.go | 2 +- pkg/kubelet/images/image_gc_manager_test.go | 2 +- pkg/kubelet/metrics/collectors/BUILD | 4 +-- pkg/kubelet/metrics/collectors/log_metrics.go | 2 +- .../metrics/collectors/log_metrics_test.go | 2 +- .../metrics/collectors/resource_metrics.go | 2 +- .../collectors/resource_metrics_test.go | 2 +- .../metrics/collectors/volume_stats.go | 2 +- .../metrics/collectors/volume_stats_test.go | 2 +- pkg/kubelet/server/BUILD | 2 +- pkg/kubelet/server/server_test.go | 2 +- pkg/kubelet/server/stats/BUILD | 4 +-- pkg/kubelet/server/stats/handler.go | 2 +- pkg/kubelet/server/stats/summary.go | 2 +- .../server/stats/summary_sys_containers.go | 2 +- .../stats/summary_sys_containers_windows.go | 2 +- pkg/kubelet/server/stats/summary_test.go | 2 +- .../server/stats/summary_windows_test.go | 2 +- pkg/kubelet/server/stats/testing/BUILD | 2 +- .../stats/testing/mock_stats_provider.go | 2 +- .../server/stats/volume_stat_calculator.go | 2 +- .../stats/volume_stat_calculator_test.go | 2 +- pkg/kubelet/stats/BUILD | 4 +-- pkg/kubelet/stats/cadvisor_stats_provider.go | 2 +- .../stats/cadvisor_stats_provider_test.go | 2 +- pkg/kubelet/stats/cri_stats_provider.go | 2 +- .../stats/cri_stats_provider_others.go | 2 +- pkg/kubelet/stats/cri_stats_provider_test.go | 2 +- .../stats/cri_stats_provider_windows.go | 2 +- pkg/kubelet/stats/helper.go | 2 +- pkg/kubelet/stats/helper_test.go | 2 +- pkg/kubelet/stats/pidlimit/BUILD | 30 +++++++++---------- pkg/kubelet/stats/pidlimit/pidlimit_linux.go | 2 +- .../stats/pidlimit/pidlimit_unsupported.go | 2 +- pkg/kubelet/stats/stats_provider.go | 2 +- pkg/kubelet/stats/stats_provider_test.go | 2 +- staging/src/k8s.io/kubelet/BUILD | 1 + .../kubelet/pkg}/apis/stats/v1alpha1/BUILD | 3 +- .../kubelet/pkg}/apis/stats/v1alpha1/types.go | 0 test/e2e/framework/BUILD | 2 +- test/e2e/framework/kubelet/BUILD | 2 +- test/e2e/framework/kubelet/stats.go | 2 +- test/e2e/framework/resource_usage_gatherer.go | 2 +- test/e2e/node/BUILD | 2 +- test/e2e/node/kubelet_perf.go | 2 +- test/e2e_node/BUILD | 4 +-- test/e2e_node/density_test.go | 2 +- test/e2e_node/eviction_test.go | 2 +- test/e2e_node/resource_collector.go | 2 +- test/e2e_node/resource_usage_test.go | 2 +- test/e2e_node/summary_test.go | 2 +- test/e2e_node/util.go | 6 ++-- vendor/modules.txt | 1 + 65 files changed, 86 insertions(+), 84 deletions(-) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/stats/v1alpha1/BUILD (78%) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/apis/stats/v1alpha1/types.go (100%) diff --git a/hack/.import-aliases b/hack/.import-aliases index 8f900b724c8..76a63aeb884 100644 --- a/hack/.import-aliases +++ b/hack/.import-aliases @@ -38,6 +38,7 @@ "k8s.io/api/storage/v1alpha1": "storagev1alpha1", "k8s.io/api/storage/v1beta1": "storagev1beta1", "k8s.io/apimachinery/pkg/api/errors": "apierrors", + "k8s.io/kubelet/apis/stats/v1alpha1": "kubeletstatsv1alpha1", "k8s.io/kubernetes/pkg/controller/apis/config/v1alpha1": "controllerconfigv1alpha1", "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1": "kubeletconfigv1beta1", "k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha": "kubeletdevicepluginv1alpha", @@ -47,7 +48,6 @@ "k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1": "kubeletpluginregistrationv1beta1", "k8s.io/kubelet/pkg/apis/podresources/v1alpha1": "kubeletpodresourcesv1alpha1", "k8s.io/kubernetes/pkg/kubelet/apis/resourcemetrics/v1alpha1": "kubeletresourcemetricsv1alpha1", - "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1": "kubeletstatsv1alpha1", "k8s.io/kubernetes/pkg/proxy/apis/config/v1alpha1": "proxyconfigv1alpha1", "k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta1": "schedulerconfigv1beta1", "k8s.io/kubernetes/test/e2e/framework/auth": "e2eauth", diff --git a/pkg/kubelet/apis/BUILD b/pkg/kubelet/apis/BUILD index 1118cce69d8..81930bf60c3 100644 --- a/pkg/kubelet/apis/BUILD +++ b/pkg/kubelet/apis/BUILD @@ -37,7 +37,6 @@ filegroup( ":package-srcs", "//pkg/kubelet/apis/config:all-srcs", "//pkg/kubelet/apis/podresources:all-srcs", - "//pkg/kubelet/apis/stats/v1alpha1:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/kubelet/eviction/BUILD b/pkg/kubelet/eviction/BUILD index a7315f84063..ec2c34d40a1 100644 --- a/pkg/kubelet/eviction/BUILD +++ b/pkg/kubelet/eviction/BUILD @@ -19,7 +19,6 @@ go_test( "//pkg/apis/core:go_default_library", "//pkg/apis/scheduling:go_default_library", "//pkg/features:go_default_library", - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/eviction/api:go_default_library", "//pkg/kubelet/lifecycle:go_default_library", "//pkg/kubelet/types:go_default_library", @@ -31,6 +30,7 @@ go_test( "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", "//vendor/github.com/stretchr/testify/mock:go_default_library", ], ) @@ -53,7 +53,6 @@ go_library( "//pkg/apis/core/v1/helper:go_default_library", "//pkg/apis/core/v1/helper/qos:go_default_library", "//pkg/features:go_default_library", - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/eviction/api:go_default_library", "//pkg/kubelet/lifecycle:go_default_library", @@ -69,6 +68,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/clock:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", ] + select({ "@io_bazel_rules_go//go/platform:android": [ diff --git a/pkg/kubelet/eviction/eviction_manager.go b/pkg/kubelet/eviction/eviction_manager.go index ade19e9be16..5c393917f77 100644 --- a/pkg/kubelet/eviction/eviction_manager.go +++ b/pkg/kubelet/eviction/eviction_manager.go @@ -30,11 +30,11 @@ import ( "k8s.io/apimachinery/pkg/util/clock" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/tools/record" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" apiv1resource "k8s.io/kubernetes/pkg/api/v1/resource" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" v1qos "k8s.io/kubernetes/pkg/apis/core/v1/helper/qos" "k8s.io/kubernetes/pkg/features" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api" "k8s.io/kubernetes/pkg/kubelet/lifecycle" "k8s.io/kubernetes/pkg/kubelet/metrics" diff --git a/pkg/kubelet/eviction/eviction_manager_test.go b/pkg/kubelet/eviction/eviction_manager_test.go index fe30006e8af..3abdbb8c4c8 100644 --- a/pkg/kubelet/eviction/eviction_manager_test.go +++ b/pkg/kubelet/eviction/eviction_manager_test.go @@ -28,10 +28,10 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/tools/record" featuregatetesting "k8s.io/component-base/featuregate/testing" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" kubeapi "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/scheduling" "k8s.io/kubernetes/pkg/features" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api" "k8s.io/kubernetes/pkg/kubelet/lifecycle" kubelettypes "k8s.io/kubernetes/pkg/kubelet/types" diff --git a/pkg/kubelet/eviction/helpers.go b/pkg/kubelet/eviction/helpers.go index b65e29357f1..e5feb7eb7ec 100644 --- a/pkg/kubelet/eviction/helpers.go +++ b/pkg/kubelet/eviction/helpers.go @@ -27,9 +27,9 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/klog/v2" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/api/v1/pod" v1resource "k8s.io/kubernetes/pkg/api/v1/resource" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" volumeutils "k8s.io/kubernetes/pkg/volume/util" diff --git a/pkg/kubelet/eviction/helpers_test.go b/pkg/kubelet/eviction/helpers_test.go index 058563501af..5b4e729fe6c 100644 --- a/pkg/kubelet/eviction/helpers_test.go +++ b/pkg/kubelet/eviction/helpers_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/types" utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/features" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" ) diff --git a/pkg/kubelet/eviction/memory_threshold_notifier.go b/pkg/kubelet/eviction/memory_threshold_notifier.go index 9497a838194..a899c98adcd 100644 --- a/pkg/kubelet/eviction/memory_threshold_notifier.go +++ b/pkg/kubelet/eviction/memory_threshold_notifier.go @@ -23,7 +23,7 @@ import ( "k8s.io/klog/v2" "k8s.io/apimachinery/pkg/api/resource" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cm" evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api" ) diff --git a/pkg/kubelet/eviction/memory_threshold_notifier_test.go b/pkg/kubelet/eviction/memory_threshold_notifier_test.go index 042949e4401..3800aadf664 100644 --- a/pkg/kubelet/eviction/memory_threshold_notifier_test.go +++ b/pkg/kubelet/eviction/memory_threshold_notifier_test.go @@ -24,7 +24,7 @@ import ( "time" "k8s.io/apimachinery/pkg/api/resource" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api" ) diff --git a/pkg/kubelet/eviction/mock_threshold_notifier_test.go b/pkg/kubelet/eviction/mock_threshold_notifier_test.go index c94e6fe5f32..7fec82cadd0 100644 --- a/pkg/kubelet/eviction/mock_threshold_notifier_test.go +++ b/pkg/kubelet/eviction/mock_threshold_notifier_test.go @@ -18,7 +18,7 @@ package eviction import ( mock "github.com/stretchr/testify/mock" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" ) // MockCgroupNotifier is a mock implementation of the CgroupNotifier interface diff --git a/pkg/kubelet/eviction/types.go b/pkg/kubelet/eviction/types.go index bbf606ff673..90c99809561 100644 --- a/pkg/kubelet/eviction/types.go +++ b/pkg/kubelet/eviction/types.go @@ -22,7 +22,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api" ) diff --git a/pkg/kubelet/images/BUILD b/pkg/kubelet/images/BUILD index 2dc53de9f46..7e19692534f 100644 --- a/pkg/kubelet/images/BUILD +++ b/pkg/kubelet/images/BUILD @@ -18,7 +18,6 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/kubelet/images", deps = [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/events:go_default_library", "//pkg/kubelet/util/sliceutils:go_default_library", @@ -29,6 +28,7 @@ go_library( "//staging/src/k8s.io/client-go/tools/record:go_default_library", "//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", "//vendor/github.com/docker/distribution/reference:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", ], @@ -42,7 +42,6 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/container/testing:go_default_library", "//pkg/kubelet/server/stats/testing:go_default_library", @@ -51,6 +50,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/util/clock:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", "//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/github.com/stretchr/testify/require:go_default_library", ], diff --git a/pkg/kubelet/images/image_gc_manager.go b/pkg/kubelet/images/image_gc_manager.go index 9ed01d7d421..e168b1d2634 100644 --- a/pkg/kubelet/images/image_gc_manager.go +++ b/pkg/kubelet/images/image_gc_manager.go @@ -31,7 +31,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/tools/record" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/kubelet/util/sliceutils" diff --git a/pkg/kubelet/images/image_gc_manager_test.go b/pkg/kubelet/images/image_gc_manager_test.go index c74e1185640..94e6b22bf7a 100644 --- a/pkg/kubelet/images/image_gc_manager_test.go +++ b/pkg/kubelet/images/image_gc_manager_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/util/clock" "k8s.io/client-go/tools/record" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" statstest "k8s.io/kubernetes/pkg/kubelet/server/stats/testing" diff --git a/pkg/kubelet/metrics/collectors/BUILD b/pkg/kubelet/metrics/collectors/BUILD index ca5de3e11b5..4d575d5bf27 100644 --- a/pkg/kubelet/metrics/collectors/BUILD +++ b/pkg/kubelet/metrics/collectors/BUILD @@ -10,11 +10,11 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubelet/metrics/collectors", visibility = ["//visibility:public"], deps = [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/metrics:go_default_library", "//pkg/kubelet/server/stats:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/component-base/metrics:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", ], ) @@ -28,10 +28,10 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/server/stats/testing:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/component-base/metrics/testutil:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", "//vendor/github.com/stretchr/testify/mock:go_default_library", ], ) diff --git a/pkg/kubelet/metrics/collectors/log_metrics.go b/pkg/kubelet/metrics/collectors/log_metrics.go index 4982b5f2236..94a5d356e10 100644 --- a/pkg/kubelet/metrics/collectors/log_metrics.go +++ b/pkg/kubelet/metrics/collectors/log_metrics.go @@ -19,7 +19,7 @@ package collectors import ( "k8s.io/component-base/metrics" "k8s.io/klog/v2" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" ) var ( diff --git a/pkg/kubelet/metrics/collectors/log_metrics_test.go b/pkg/kubelet/metrics/collectors/log_metrics_test.go index 2dcbba4db97..a4efce64076 100644 --- a/pkg/kubelet/metrics/collectors/log_metrics_test.go +++ b/pkg/kubelet/metrics/collectors/log_metrics_test.go @@ -21,7 +21,7 @@ import ( "testing" "k8s.io/component-base/metrics/testutil" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" ) func TestNoMetricsCollected(t *testing.T) { diff --git a/pkg/kubelet/metrics/collectors/resource_metrics.go b/pkg/kubelet/metrics/collectors/resource_metrics.go index 00945f4ca6b..0c3932f801e 100644 --- a/pkg/kubelet/metrics/collectors/resource_metrics.go +++ b/pkg/kubelet/metrics/collectors/resource_metrics.go @@ -21,7 +21,7 @@ import ( "k8s.io/component-base/metrics" "k8s.io/klog/v2" - summary "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + summary "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/server/stats" ) diff --git a/pkg/kubelet/metrics/collectors/resource_metrics_test.go b/pkg/kubelet/metrics/collectors/resource_metrics_test.go index 2470c1b21fb..b0a3fb972dc 100644 --- a/pkg/kubelet/metrics/collectors/resource_metrics_test.go +++ b/pkg/kubelet/metrics/collectors/resource_metrics_test.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/component-base/metrics/testutil" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" ) type mockSummaryProvider struct { diff --git a/pkg/kubelet/metrics/collectors/volume_stats.go b/pkg/kubelet/metrics/collectors/volume_stats.go index 1c76a7ca1eb..8ff14a0b2ac 100644 --- a/pkg/kubelet/metrics/collectors/volume_stats.go +++ b/pkg/kubelet/metrics/collectors/volume_stats.go @@ -19,7 +19,7 @@ package collectors import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/component-base/metrics" - stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + stats "k8s.io/kubelet/pkg/apis/stats/v1alpha1" kubeletmetrics "k8s.io/kubernetes/pkg/kubelet/metrics" serverstats "k8s.io/kubernetes/pkg/kubelet/server/stats" ) diff --git a/pkg/kubelet/metrics/collectors/volume_stats_test.go b/pkg/kubelet/metrics/collectors/volume_stats_test.go index 3ff2df51f01..d7184a8b8c5 100644 --- a/pkg/kubelet/metrics/collectors/volume_stats_test.go +++ b/pkg/kubelet/metrics/collectors/volume_stats_test.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/component-base/metrics/testutil" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" statstest "k8s.io/kubernetes/pkg/kubelet/server/stats/testing" ) diff --git a/pkg/kubelet/server/BUILD b/pkg/kubelet/server/BUILD index a17e6a90685..4f7b5857c86 100644 --- a/pkg/kubelet/server/BUILD +++ b/pkg/kubelet/server/BUILD @@ -73,7 +73,6 @@ go_test( deps = [ "//pkg/apis/core:go_default_library", "//pkg/apis/core/install:go_default_library", - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/cri/streaming:go_default_library", @@ -92,6 +91,7 @@ go_test( "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", "//staging/src/k8s.io/client-go/util/testing:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", "//vendor/github.com/google/cadvisor/info/v1:go_default_library", "//vendor/github.com/google/cadvisor/info/v2:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", diff --git a/pkg/kubelet/server/server_test.go b/pkg/kubelet/server/server_test.go index 15779d4acc7..30958599c75 100644 --- a/pkg/kubelet/server/server_test.go +++ b/pkg/kubelet/server/server_test.go @@ -50,8 +50,8 @@ import ( "k8s.io/client-go/tools/remotecommand" utiltesting "k8s.io/client-go/util/testing" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" api "k8s.io/kubernetes/pkg/apis/core" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" "k8s.io/utils/pointer" // Do some initialization to decode the query parameters correctly. diff --git a/pkg/kubelet/server/stats/BUILD b/pkg/kubelet/server/stats/BUILD index 71ebd5b0136..c932cad4b76 100644 --- a/pkg/kubelet/server/stats/BUILD +++ b/pkg/kubelet/server/stats/BUILD @@ -15,7 +15,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubelet/server/stats", visibility = ["//visibility:public"], deps = [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/util:go_default_library", @@ -25,6 +24,7 @@ go_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/apimachinery/pkg/util/wait:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", "//vendor/github.com/emicklei/go-restful:go_default_library", "//vendor/github.com/google/cadvisor/info/v1:go_default_library", "//vendor/github.com/google/cadvisor/info/v2:go_default_library", @@ -42,12 +42,12 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/server/stats/testing:go_default_library", "//pkg/volume:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", ] + select({ "@io_bazel_rules_go//go/platform:aix": [ diff --git a/pkg/kubelet/server/stats/handler.go b/pkg/kubelet/server/stats/handler.go index 7a5c165ef32..3d2260c48b6 100644 --- a/pkg/kubelet/server/stats/handler.go +++ b/pkg/kubelet/server/stats/handler.go @@ -33,7 +33,7 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/kubelet/server/stats/summary.go b/pkg/kubelet/server/stats/summary.go index edf69fc7a8f..fffa38c7012 100644 --- a/pkg/kubelet/server/stats/summary.go +++ b/pkg/kubelet/server/stats/summary.go @@ -22,7 +22,7 @@ import ( "k8s.io/klog/v2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/util" ) diff --git a/pkg/kubelet/server/stats/summary_sys_containers.go b/pkg/kubelet/server/stats/summary_sys_containers.go index 40e794a79f0..38d6685dd6e 100644 --- a/pkg/kubelet/server/stats/summary_sys_containers.go +++ b/pkg/kubelet/server/stats/summary_sys_containers.go @@ -22,7 +22,7 @@ import ( "k8s.io/klog/v2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cm" ) diff --git a/pkg/kubelet/server/stats/summary_sys_containers_windows.go b/pkg/kubelet/server/stats/summary_sys_containers_windows.go index cb8dcb3c898..1e833c995d2 100644 --- a/pkg/kubelet/server/stats/summary_sys_containers_windows.go +++ b/pkg/kubelet/server/stats/summary_sys_containers_windows.go @@ -22,7 +22,7 @@ import ( "time" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cm" ) diff --git a/pkg/kubelet/server/stats/summary_test.go b/pkg/kubelet/server/stats/summary_test.go index 198afd96765..74ebcb1dae4 100644 --- a/pkg/kubelet/server/stats/summary_test.go +++ b/pkg/kubelet/server/stats/summary_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cm" statstest "k8s.io/kubernetes/pkg/kubelet/server/stats/testing" ) diff --git a/pkg/kubelet/server/stats/summary_windows_test.go b/pkg/kubelet/server/stats/summary_windows_test.go index 35eac777bf4..18d41ac75c6 100644 --- a/pkg/kubelet/server/stats/summary_windows_test.go +++ b/pkg/kubelet/server/stats/summary_windows_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cm" statstest "k8s.io/kubernetes/pkg/kubelet/server/stats/testing" ) diff --git a/pkg/kubelet/server/stats/testing/BUILD b/pkg/kubelet/server/stats/testing/BUILD index 99da500d1d4..4f3e24c236d 100644 --- a/pkg/kubelet/server/stats/testing/BUILD +++ b/pkg/kubelet/server/stats/testing/BUILD @@ -6,11 +6,11 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubelet/server/stats/testing", visibility = ["//visibility:public"], deps = [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/volume:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", "//vendor/github.com/google/cadvisor/info/v1:go_default_library", "//vendor/github.com/google/cadvisor/info/v2:go_default_library", "//vendor/github.com/stretchr/testify/mock:go_default_library", diff --git a/pkg/kubelet/server/stats/testing/mock_stats_provider.go b/pkg/kubelet/server/stats/testing/mock_stats_provider.go index 5ba37562c1c..73011bd9eb4 100644 --- a/pkg/kubelet/server/stats/testing/mock_stats_provider.go +++ b/pkg/kubelet/server/stats/testing/mock_stats_provider.go @@ -23,7 +23,7 @@ import mock "github.com/stretchr/testify/mock" import types "k8s.io/apimachinery/pkg/types" import v1 "github.com/google/cadvisor/info/v1" import v2 "github.com/google/cadvisor/info/v2" -import v1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" +import v1alpha1 "k8s.io/kubelet/pkg/apis/stats/v1alpha1" import volume "k8s.io/kubernetes/pkg/volume" // GENERATED BY mockery diff --git a/pkg/kubelet/server/stats/volume_stat_calculator.go b/pkg/kubelet/server/stats/volume_stat_calculator.go index f0e3e993d94..1cc8c2d7af6 100644 --- a/pkg/kubelet/server/stats/volume_stat_calculator.go +++ b/pkg/kubelet/server/stats/volume_stat_calculator.go @@ -23,7 +23,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/wait" - stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + stats "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/util/format" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/kubelet/server/stats/volume_stat_calculator_test.go b/pkg/kubelet/server/stats/volume_stat_calculator_test.go index 6b54ea6f9fd..69d3eec7f2c 100644 --- a/pkg/kubelet/server/stats/volume_stat_calculator_test.go +++ b/pkg/kubelet/server/stats/volume_stat_calculator_test.go @@ -25,7 +25,7 @@ import ( k8sv1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - kubestats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + kubestats "k8s.io/kubelet/pkg/apis/stats/v1alpha1" statstest "k8s.io/kubernetes/pkg/kubelet/server/stats/testing" "k8s.io/kubernetes/pkg/volume" ) diff --git a/pkg/kubelet/stats/BUILD b/pkg/kubelet/stats/BUILD index 0ad89ab92ce..67caf7dc2da 100644 --- a/pkg/kubelet/stats/BUILD +++ b/pkg/kubelet/stats/BUILD @@ -14,7 +14,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubelet/stats", visibility = ["//visibility:public"], deps = [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/cadvisor:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/container:go_default_library", @@ -30,6 +29,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/types: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/stats/v1alpha1:go_default_library", "//vendor/github.com/google/cadvisor/fs:go_default_library", "//vendor/github.com/google/cadvisor/info/v1:go_default_library", "//vendor/github.com/google/cadvisor/info/v2:go_default_library", @@ -71,7 +71,6 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/cadvisor/testing:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/container:go_default_library", @@ -90,6 +89,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis/testing:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", "//vendor/github.com/golang/mock/gomock:go_default_library", "//vendor/github.com/google/cadvisor/fs:go_default_library", "//vendor/github.com/google/cadvisor/info/v1:go_default_library", diff --git a/pkg/kubelet/stats/cadvisor_stats_provider.go b/pkg/kubelet/stats/cadvisor_stats_provider.go index 7fd131abc80..36a402ae96d 100644 --- a/pkg/kubelet/stats/cadvisor_stats_provider.go +++ b/pkg/kubelet/stats/cadvisor_stats_provider.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/stats/cadvisor_stats_provider_test.go b/pkg/kubelet/stats/cadvisor_stats_provider_test.go index 9e1faee180e..7c2fffa240b 100644 --- a/pkg/kubelet/stats/cadvisor_stats_provider_test.go +++ b/pkg/kubelet/stats/cadvisor_stats_provider_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" diff --git a/pkg/kubelet/stats/cri_stats_provider.go b/pkg/kubelet/stats/cri_stats_provider.go index 6027f7095d6..6209589e7eb 100644 --- a/pkg/kubelet/stats/cri_stats_provider.go +++ b/pkg/kubelet/stats/cri_stats_provider.go @@ -33,7 +33,7 @@ import ( internalapi "k8s.io/cri-api/pkg/apis" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" "k8s.io/klog/v2" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cadvisor" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/kuberuntime" diff --git a/pkg/kubelet/stats/cri_stats_provider_others.go b/pkg/kubelet/stats/cri_stats_provider_others.go index 78a2c2befff..78a3f5db12d 100644 --- a/pkg/kubelet/stats/cri_stats_provider_others.go +++ b/pkg/kubelet/stats/cri_stats_provider_others.go @@ -19,7 +19,7 @@ limitations under the License. package stats import ( - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" ) // listContainerNetworkStats returns the network stats of all the running containers. diff --git a/pkg/kubelet/stats/cri_stats_provider_test.go b/pkg/kubelet/stats/cri_stats_provider_test.go index d4d5e7c195b..a37aea3f98c 100644 --- a/pkg/kubelet/stats/cri_stats_provider_test.go +++ b/pkg/kubelet/stats/cri_stats_provider_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" critest "k8s.io/cri-api/pkg/apis/testing" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainertest "k8s.io/kubernetes/pkg/kubelet/container/testing" diff --git a/pkg/kubelet/stats/cri_stats_provider_windows.go b/pkg/kubelet/stats/cri_stats_provider_windows.go index 0b38c69a6f0..897598bb409 100644 --- a/pkg/kubelet/stats/cri_stats_provider_windows.go +++ b/pkg/kubelet/stats/cri_stats_provider_windows.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" ) // listContainerNetworkStats returns the network stats of all the running containers. diff --git a/pkg/kubelet/stats/helper.go b/pkg/kubelet/stats/helper.go index e34d9d5ca8c..8618b36e013 100644 --- a/pkg/kubelet/stats/helper.go +++ b/pkg/kubelet/stats/helper.go @@ -24,7 +24,7 @@ import ( cadvisorapiv2 "github.com/google/cadvisor/info/v2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog/v2" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cadvisor" ) diff --git a/pkg/kubelet/stats/helper_test.go b/pkg/kubelet/stats/helper_test.go index c1b13423cbb..38486bd9f85 100644 --- a/pkg/kubelet/stats/helper_test.go +++ b/pkg/kubelet/stats/helper_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" ) func TestCustomMetrics(t *testing.T) { diff --git a/pkg/kubelet/stats/pidlimit/BUILD b/pkg/kubelet/stats/pidlimit/BUILD index 5317dfd86db..b9f8ef5ebcb 100644 --- a/pkg/kubelet/stats/pidlimit/BUILD +++ b/pkg/kubelet/stats/pidlimit/BUILD @@ -13,51 +13,51 @@ go_library( "//staging/src/k8s.io/api/core/v1:go_default_library", ] + select({ "@io_bazel_rules_go//go/platform:aix": [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", ], "@io_bazel_rules_go//go/platform:android": [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", ], "@io_bazel_rules_go//go/platform:darwin": [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", ], "@io_bazel_rules_go//go/platform:dragonfly": [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", ], "@io_bazel_rules_go//go/platform:freebsd": [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", ], "@io_bazel_rules_go//go/platform:illumos": [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", ], "@io_bazel_rules_go//go/platform:ios": [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", ], "@io_bazel_rules_go//go/platform:js": [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", ], "@io_bazel_rules_go//go/platform:linux": [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", ], "@io_bazel_rules_go//go/platform:nacl": [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", ], "@io_bazel_rules_go//go/platform:netbsd": [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", ], "@io_bazel_rules_go//go/platform:openbsd": [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", ], "@io_bazel_rules_go//go/platform:plan9": [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", ], "@io_bazel_rules_go//go/platform:solaris": [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", ], "@io_bazel_rules_go//go/platform:windows": [ - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", ], "//conditions:default": [], }), diff --git a/pkg/kubelet/stats/pidlimit/pidlimit_linux.go b/pkg/kubelet/stats/pidlimit/pidlimit_linux.go index d537f48f8b2..f02d92f5651 100644 --- a/pkg/kubelet/stats/pidlimit/pidlimit_linux.go +++ b/pkg/kubelet/stats/pidlimit/pidlimit_linux.go @@ -25,7 +25,7 @@ import ( "time" "k8s.io/apimachinery/pkg/apis/meta/v1" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" ) // Stats provides basic information about max and current process count diff --git a/pkg/kubelet/stats/pidlimit/pidlimit_unsupported.go b/pkg/kubelet/stats/pidlimit/pidlimit_unsupported.go index 825c7852200..314a8061a52 100644 --- a/pkg/kubelet/stats/pidlimit/pidlimit_unsupported.go +++ b/pkg/kubelet/stats/pidlimit/pidlimit_unsupported.go @@ -19,7 +19,7 @@ limitations under the License. package pidlimit import ( - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" ) // Stats provides basic information about max and current process count diff --git a/pkg/kubelet/stats/stats_provider.go b/pkg/kubelet/stats/stats_provider.go index 3b0f8542c85..3f89cb72c4f 100644 --- a/pkg/kubelet/stats/stats_provider.go +++ b/pkg/kubelet/stats/stats_provider.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" internalapi "k8s.io/cri-api/pkg/apis" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cadvisor" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubepod "k8s.io/kubernetes/pkg/kubelet/pod" diff --git a/pkg/kubelet/stats/stats_provider_test.go b/pkg/kubelet/stats/stats_provider_test.go index a830af322e1..e6a65dafe5d 100644 --- a/pkg/kubelet/stats/stats_provider_test.go +++ b/pkg/kubelet/stats/stats_provider_test.go @@ -29,7 +29,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubecontainertest "k8s.io/kubernetes/pkg/kubelet/container/testing" diff --git a/staging/src/k8s.io/kubelet/BUILD b/staging/src/k8s.io/kubelet/BUILD index 9c211f08217..3a6b0cafc55 100644 --- a/staging/src/k8s.io/kubelet/BUILD +++ b/staging/src/k8s.io/kubelet/BUILD @@ -16,6 +16,7 @@ filegroup( "//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", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/pkg/kubelet/apis/stats/v1alpha1/BUILD b/staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1/BUILD similarity index 78% rename from pkg/kubelet/apis/stats/v1alpha1/BUILD rename to staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1/BUILD index 3244cdf511c..d408b79f66f 100644 --- a/pkg/kubelet/apis/stats/v1alpha1/BUILD +++ b/staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1/BUILD @@ -8,7 +8,8 @@ load( go_library( name = "go_default_library", srcs = ["types.go"], - importpath = "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubelet/pkg/apis/stats/v1alpha1", + importpath = "k8s.io/kubelet/pkg/apis/stats/v1alpha1", deps = ["//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library"], ) diff --git a/pkg/kubelet/apis/stats/v1alpha1/types.go b/staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1/types.go similarity index 100% rename from pkg/kubelet/apis/stats/v1alpha1/types.go rename to staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1/types.go diff --git a/test/e2e/framework/BUILD b/test/e2e/framework/BUILD index 43f11641e2c..eba25b2c3aa 100644 --- a/test/e2e/framework/BUILD +++ b/test/e2e/framework/BUILD @@ -24,7 +24,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubelet/apis/config:go_default_library", - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/policy/v1beta1:go_default_library", "//staging/src/k8s.io/api/rbac/v1:go_default_library", @@ -58,6 +57,7 @@ go_library( "//staging/src/k8s.io/component-base/cli/flag:go_default_library", "//staging/src/k8s.io/component-base/featuregate:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/podutils:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", "//test/e2e/framework/auth:go_default_library", "//test/e2e/framework/ginkgowrapper:go_default_library", "//test/e2e/framework/kubectl:go_default_library", diff --git a/test/e2e/framework/kubelet/BUILD b/test/e2e/framework/kubelet/BUILD index 90177da2328..8e50b7def6c 100644 --- a/test/e2e/framework/kubelet/BUILD +++ b/test/e2e/framework/kubelet/BUILD @@ -12,7 +12,6 @@ go_library( deps = [ "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/apis/config/scheme:go_default_library", - "//pkg/kubelet/apis/stats/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/util/errors:go_default_library", @@ -20,6 +19,7 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/kubelet/config/v1beta1:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", "//test/e2e/framework:go_default_library", "//test/e2e/framework/kubectl:go_default_library", "//test/e2e/framework/metrics:go_default_library", diff --git a/test/e2e/framework/kubelet/stats.go b/test/e2e/framework/kubelet/stats.go index 552d9a14ad0..6484081e022 100644 --- a/test/e2e/framework/kubelet/stats.go +++ b/test/e2e/framework/kubelet/stats.go @@ -33,7 +33,7 @@ import ( clientset "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" - kubeletstatsv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + kubeletstatsv1alpha1 "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/test/e2e/framework" e2emetrics "k8s.io/kubernetes/test/e2e/framework/metrics" ) diff --git a/test/e2e/framework/resource_usage_gatherer.go b/test/e2e/framework/resource_usage_gatherer.go index 4673b60d133..5d315060d22 100644 --- a/test/e2e/framework/resource_usage_gatherer.go +++ b/test/e2e/framework/resource_usage_gatherer.go @@ -36,7 +36,7 @@ import ( "k8s.io/apimachinery/pkg/fields" utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientset "k8s.io/client-go/kubernetes" - kubeletstatsv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + kubeletstatsv1alpha1 "k8s.io/kubelet/pkg/apis/stats/v1alpha1" // TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245) e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" diff --git a/test/e2e/node/BUILD b/test/e2e/node/BUILD index 829e942b095..ff7673e37dc 100644 --- a/test/e2e/node/BUILD +++ b/test/e2e/node/BUILD @@ -25,7 +25,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/cluster/ports:go_default_library", - "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/events:go_default_library", "//pkg/kubelet/runtimeclass/testing:go_default_library", "//pkg/util/slice:go_default_library", @@ -44,6 +43,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/tools/cache:go_default_library", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", "//test/e2e/framework:go_default_library", "//test/e2e/framework/job:go_default_library", "//test/e2e/framework/kubectl:go_default_library", diff --git a/test/e2e/node/kubelet_perf.go b/test/e2e/node/kubelet_perf.go index 14cfb8d8200..a2668264c81 100644 --- a/test/e2e/node/kubelet_perf.go +++ b/test/e2e/node/kubelet_perf.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/uuid" clientset "k8s.io/client-go/kubernetes" - kubeletstatsv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + kubeletstatsv1alpha1 "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/test/e2e/framework" e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet" e2enode "k8s.io/kubernetes/test/e2e/framework/node" diff --git a/test/e2e_node/BUILD b/test/e2e_node/BUILD index 06bbbfb8ec4..75250abdfb9 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/stats/v1alpha1:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/cm/cpuset:go_default_library", "//pkg/kubelet/cri/remote:go_default_library", @@ -49,6 +48,7 @@ go_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", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/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/stats/v1alpha1:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/cm/cpumanager:go_default_library", "//pkg/kubelet/cm/cpumanager/state:go_default_library", @@ -196,6 +195,7 @@ go_test( "//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", + "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", "//staging/src/k8s.io/mount-utils:go_default_library", "//test/e2e/common:go_default_library", "//test/e2e/framework:go_default_library", diff --git a/test/e2e_node/density_test.go b/test/e2e_node/density_test.go index bc66af8e11e..d1a7a8a7de5 100644 --- a/test/e2e_node/density_test.go +++ b/test/e2e_node/density_test.go @@ -33,8 +33,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" + kubeletstatsv1alpha1 "k8s.io/kubelet/pkg/apis/stats/v1alpha1" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" - kubeletstatsv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" kubemetrics "k8s.io/kubernetes/pkg/kubelet/metrics" "k8s.io/kubernetes/test/e2e/framework" e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet" diff --git a/test/e2e_node/eviction_test.go b/test/e2e_node/eviction_test.go index 282ad12124b..81ed808a03c 100644 --- a/test/e2e_node/eviction_test.go +++ b/test/e2e_node/eviction_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" + kubeletstatsv1alpha1 "k8s.io/kubelet/pkg/apis/stats/v1alpha1" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" - kubeletstatsv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/eviction" evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api" kubeletmetrics "k8s.io/kubernetes/pkg/kubelet/metrics" diff --git a/test/e2e_node/resource_collector.go b/test/e2e_node/resource_collector.go index 8ab4fdaddf1..94216434d90 100644 --- a/test/e2e_node/resource_collector.go +++ b/test/e2e_node/resource_collector.go @@ -41,7 +41,7 @@ import ( "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" - kubeletstatsv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + kubeletstatsv1alpha1 "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/util/procfs" "k8s.io/kubernetes/test/e2e/framework" e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet" diff --git a/test/e2e_node/resource_usage_test.go b/test/e2e_node/resource_usage_test.go index 1706dcbc5cf..0704b8271b7 100644 --- a/test/e2e_node/resource_usage_test.go +++ b/test/e2e_node/resource_usage_test.go @@ -24,7 +24,7 @@ import ( "time" clientset "k8s.io/client-go/kubernetes" - kubeletstatsv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + kubeletstatsv1alpha1 "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/test/e2e/framework" e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet" e2eperf "k8s.io/kubernetes/test/e2e/framework/perf" diff --git a/test/e2e_node/summary_test.go b/test/e2e_node/summary_test.go index c2f5d350635..004de686de8 100644 --- a/test/e2e_node/summary_test.go +++ b/test/e2e_node/summary_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - kubeletstatsv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" + kubeletstatsv1alpha1 "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/test/e2e/framework" e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl" e2evolume "k8s.io/kubernetes/test/e2e/framework/volume" diff --git a/test/e2e_node/util.go b/test/e2e_node/util.go index bb680b2b2a2..bae5d51f04f 100644 --- a/test/e2e_node/util.go +++ b/test/e2e_node/util.go @@ -39,10 +39,10 @@ import ( "k8s.io/klog/v2" kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1" kubeletpodresourcesv1alpha1 "k8s.io/kubelet/pkg/apis/podresources/v1alpha1" + stats "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/features" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/apis/podresources" - kubeletstatsv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/pkg/kubelet/cri/remote" kubeletconfigcodec "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/codec" @@ -71,7 +71,7 @@ const ( defaultPodResourcesMaxSize = 1024 * 1024 * 16 // 16 Mb ) -func getNodeSummary() (*kubeletstatsv1alpha1.Summary, error) { +func getNodeSummary() (*stats.Summary, error) { kubeletConfig, err := getCurrentKubeletConfig() if err != nil { return nil, fmt.Errorf("failed to get current kubelet config") @@ -95,7 +95,7 @@ func getNodeSummary() (*kubeletstatsv1alpha1.Summary, error) { } decoder := json.NewDecoder(strings.NewReader(string(contentsBytes))) - summary := kubeletstatsv1alpha1.Summary{} + summary := stats.Summary{} err = decoder.Decode(&summary) if err != nil { return nil, fmt.Errorf("failed to parse /stats/summary to go struct: %+v", resp) diff --git a/vendor/modules.txt b/vendor/modules.txt index 6ab35965df7..172ef7890fa 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2361,6 +2361,7 @@ 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/kubelet/pkg/apis/stats/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