From a6554b9d5d1e71c9e76cf603d581e820e987dc32 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 19 Jun 2023 11:05:59 +0200 Subject: [PATCH] Make kubelet label types public We use the label definitions in CRI-O, means we now make them public to stop vendoring/copying this part of Kubernetes. Signed-off-by: Sascha Grunert --- pkg/kubelet/kuberuntime/kuberuntime_container.go | 3 ++- pkg/kubelet/kuberuntime/kuberuntime_sandbox.go | 2 +- pkg/kubelet/kuberuntime/labels.go | 2 +- pkg/kubelet/server/server.go | 2 +- pkg/kubelet/stats/cadvisor_stats_provider.go | 2 +- pkg/kubelet/stats/cri_stats_provider.go | 2 +- .../kubelet => staging/src/k8s.io/kubelet/pkg}/types/labels.go | 0 .../src/k8s.io/kubelet/pkg}/types/labels_test.go | 0 test/e2e_node/cpu_manager_test.go | 2 +- test/e2e_node/garbage_collector_test.go | 2 +- test/e2e_node/util.go | 2 +- vendor/modules.txt | 1 + 12 files changed, 11 insertions(+), 9 deletions(-) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/types/labels.go (100%) rename {pkg/kubelet => staging/src/k8s.io/kubelet/pkg}/types/labels_test.go (100%) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container.go b/pkg/kubelet/kuberuntime/kuberuntime_container.go index 5628620d72b..6cb49faf91e 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_container.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_container.go @@ -48,6 +48,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" utilfeature "k8s.io/apiserver/pkg/util/feature" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" + kubelettypes "k8s.io/kubelet/pkg/types" "k8s.io/kubernetes/pkg/features" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/cri/remote" @@ -549,7 +550,7 @@ func (m *kubeGenericRuntimeManager) convertToKubeContainerStatus(status *runtime func (m *kubeGenericRuntimeManager) getPodContainerStatuses(ctx context.Context, uid kubetypes.UID, name, namespace string) ([]*kubecontainer.Status, error) { // Select all containers of the given pod. containers, err := m.runtimeService.ListContainers(ctx, &runtimeapi.ContainerFilter{ - LabelSelector: map[string]string{types.KubernetesPodUIDLabel: string(uid)}, + LabelSelector: map[string]string{kubelettypes.KubernetesPodUIDLabel: string(uid)}, }) if err != nil { klog.ErrorS(err, "ListContainers error") diff --git a/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go b/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go index a22a362dbd3..c954b2d9208 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go @@ -28,10 +28,10 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" "k8s.io/klog/v2" + "k8s.io/kubelet/pkg/types" "k8s.io/kubernetes/pkg/features" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" runtimeutil "k8s.io/kubernetes/pkg/kubelet/kuberuntime/util" - "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/kubelet/util" "k8s.io/kubernetes/pkg/kubelet/util/format" netutils "k8s.io/utils/net" diff --git a/pkg/kubelet/kuberuntime/labels.go b/pkg/kubelet/kuberuntime/labels.go index ae1ac604862..ef319eed868 100644 --- a/pkg/kubelet/kuberuntime/labels.go +++ b/pkg/kubelet/kuberuntime/labels.go @@ -24,9 +24,9 @@ import ( kubetypes "k8s.io/apimachinery/pkg/types" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/klog/v2" + "k8s.io/kubelet/pkg/types" "k8s.io/kubernetes/pkg/features" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "k8s.io/kubernetes/pkg/kubelet/types" ) const ( diff --git a/pkg/kubelet/server/server.go b/pkg/kubelet/server/server.go index 8e21d3fa50a..7ee617cc5fe 100644 --- a/pkg/kubelet/server/server.go +++ b/pkg/kubelet/server/server.go @@ -72,6 +72,7 @@ import ( "k8s.io/kubelet/pkg/cri/streaming" "k8s.io/kubelet/pkg/cri/streaming/portforward" remotecommandserver "k8s.io/kubelet/pkg/cri/streaming/remotecommand" + kubelettypes "k8s.io/kubelet/pkg/types" "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/core/v1/validation" @@ -83,7 +84,6 @@ import ( "k8s.io/kubernetes/pkg/kubelet/prober" servermetrics "k8s.io/kubernetes/pkg/kubelet/server/metrics" "k8s.io/kubernetes/pkg/kubelet/server/stats" - kubelettypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/kubelet/util" ) diff --git a/pkg/kubelet/stats/cadvisor_stats_provider.go b/pkg/kubelet/stats/cadvisor_stats_provider.go index be428561d1e..e769bd60d43 100644 --- a/pkg/kubelet/stats/cadvisor_stats_provider.go +++ b/pkg/kubelet/stats/cadvisor_stats_provider.go @@ -29,13 +29,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" + kubetypes "k8s.io/kubelet/pkg/types" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/leaky" "k8s.io/kubernetes/pkg/kubelet/server/stats" "k8s.io/kubernetes/pkg/kubelet/status" - kubetypes "k8s.io/kubernetes/pkg/kubelet/types" ) // cadvisorStatsProvider implements the containerStatsProvider interface by diff --git a/pkg/kubelet/stats/cri_stats_provider.go b/pkg/kubelet/stats/cri_stats_provider.go index d1e1d90b275..d2e0b8c05ed 100644 --- a/pkg/kubelet/stats/cri_stats_provider.go +++ b/pkg/kubelet/stats/cri_stats_provider.go @@ -36,9 +36,9 @@ import ( runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" "k8s.io/klog/v2" statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" + kubetypes "k8s.io/kubelet/pkg/types" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/kubelet/server/stats" - kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/utils/clock" ) diff --git a/pkg/kubelet/types/labels.go b/staging/src/k8s.io/kubelet/pkg/types/labels.go similarity index 100% rename from pkg/kubelet/types/labels.go rename to staging/src/k8s.io/kubelet/pkg/types/labels.go diff --git a/pkg/kubelet/types/labels_test.go b/staging/src/k8s.io/kubelet/pkg/types/labels_test.go similarity index 100% rename from pkg/kubelet/types/labels_test.go rename to staging/src/k8s.io/kubelet/pkg/types/labels_test.go diff --git a/test/e2e_node/cpu_manager_test.go b/test/e2e_node/cpu_manager_test.go index 0b3fb3039b3..19781bcc62c 100644 --- a/test/e2e_node/cpu_manager_test.go +++ b/test/e2e_node/cpu_manager_test.go @@ -29,9 +29,9 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" + "k8s.io/kubelet/pkg/types" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager" - "k8s.io/kubernetes/pkg/kubelet/types" admissionapi "k8s.io/pod-security-admission/api" "k8s.io/utils/cpuset" diff --git a/test/e2e_node/garbage_collector_test.go b/test/e2e_node/garbage_collector_test.go index 6c69fefa1e9..a89381571bd 100644 --- a/test/e2e_node/garbage_collector_test.go +++ b/test/e2e_node/garbage_collector_test.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" internalapi "k8s.io/cri-api/pkg/apis" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" - "k8s.io/kubernetes/pkg/kubelet/types" + "k8s.io/kubelet/pkg/types" "k8s.io/kubernetes/test/e2e/framework" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" admissionapi "k8s.io/pod-security-admission/api" diff --git a/test/e2e_node/util.go b/test/e2e_node/util.go index d98f8325f09..3a9b082c8b8 100644 --- a/test/e2e_node/util.go +++ b/test/e2e_node/util.go @@ -51,13 +51,13 @@ import ( kubeletpodresourcesv1 "k8s.io/kubelet/pkg/apis/podresources/v1" kubeletpodresourcesv1alpha1 "k8s.io/kubelet/pkg/apis/podresources/v1alpha1" stats "k8s.io/kubelet/pkg/apis/stats/v1alpha1" + "k8s.io/kubelet/pkg/types" "k8s.io/kubernetes/pkg/cluster/ports" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/apis/podresources" "k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/pkg/kubelet/cri/remote" kubeletmetrics "k8s.io/kubernetes/pkg/kubelet/metrics" - "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/kubelet/util" "github.com/coreos/go-systemd/v22/dbus" diff --git a/vendor/modules.txt b/vendor/modules.txt index 229a886360a..59d14508802 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2269,6 +2269,7 @@ k8s.io/kubelet/pkg/apis/stats/v1alpha1 k8s.io/kubelet/pkg/cri/streaming k8s.io/kubelet/pkg/cri/streaming/portforward k8s.io/kubelet/pkg/cri/streaming/remotecommand +k8s.io/kubelet/pkg/types # k8s.io/legacy-cloud-providers v0.0.0 => ./staging/src/k8s.io/legacy-cloud-providers ## explicit; go 1.20 k8s.io/legacy-cloud-providers/azure