From 1031977b7d8526853ba1907d1c15ee3943ad689b Mon Sep 17 00:00:00 2001 From: Moshe Levi Date: Sun, 19 Mar 2023 13:20:32 +0200 Subject: [PATCH] kubelet PodResources API: follow-up review comments Signed-off-by: Moshe Levi --- pkg/kubelet/apis/podresources/server_v1.go | 11 +++++++---- pkg/kubelet/apis/podresources/server_v1_test.go | 15 +++++++++------ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/pkg/kubelet/apis/podresources/server_v1.go b/pkg/kubelet/apis/podresources/server_v1.go index ad6734ae729..dcbf8ed4f31 100644 --- a/pkg/kubelet/apis/podresources/server_v1.go +++ b/pkg/kubelet/apis/podresources/server_v1.go @@ -79,9 +79,10 @@ func (p *v1PodResourcesServer) List(ctx context.Context, req *v1.ListPodResource podResources[i] = &pRes } - return &v1.ListPodResourcesResponse{ + response := &v1.ListPodResourcesResponse{ PodResources: podResources, - }, nil + } + return response, nil } // GetAllocatableResources returns information about all the resources known by the server - this more like the capacity, not like the current amount of free resources. @@ -94,11 +95,13 @@ func (p *v1PodResourcesServer) GetAllocatableResources(ctx context.Context, req return nil, fmt.Errorf("PodResources API GetAllocatableResources disabled") } - return &v1.AllocatableResourcesResponse{ + response := &v1.AllocatableResourcesResponse{ Devices: p.devicesProvider.GetAllocatableDevices(), CpuIds: p.cpusProvider.GetAllocatableCPUs(), Memory: p.memoryProvider.GetAllocatableMemory(), - }, nil + } + + return response, nil } // Get returns information about the resources assigned to a specific pod diff --git a/pkg/kubelet/apis/podresources/server_v1_test.go b/pkg/kubelet/apis/podresources/server_v1_test.go index 8688876a108..fc1cc9739c0 100644 --- a/pkg/kubelet/apis/podresources/server_v1_test.go +++ b/pkg/kubelet/apis/podresources/server_v1_test.go @@ -35,6 +35,8 @@ import ( ) func TestListPodResourcesV1(t *testing.T) { + defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, pkgfeatures.KubeletPodResourcesDynamicResources, true)() + podName := "pod-name" podNamespace := "pod-namespace" podUID := types.UID("pod-uid") @@ -213,7 +215,6 @@ func TestListPodResourcesV1(t *testing.T) { }, } { t.Run(tc.desc, func(t *testing.T) { - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, pkgfeatures.KubeletPodResourcesDynamicResources, true)() mockDevicesProvider := podresourcetest.NewMockDevicesProvider(mockCtrl) mockPodsProvider := podresourcetest.NewMockPodsProvider(mockCtrl) mockCPUsProvider := podresourcetest.NewMockCPUsProvider(mockCtrl) @@ -545,6 +546,9 @@ func TestAllocatableResources(t *testing.T) { } func TestGetPodResourcesV1(t *testing.T) { + defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, pkgfeatures.KubeletPodResourcesGet, true)() + defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, pkgfeatures.KubeletPodResourcesDynamicResources, true)() + podName := "pod-name" podNamespace := "pod-namespace" podUID := types.UID("pod-uid") @@ -677,8 +681,6 @@ func TestGetPodResourcesV1(t *testing.T) { }, } { t.Run(tc.desc, func(t *testing.T) { - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, pkgfeatures.KubeletPodResourcesGet, true)() - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, pkgfeatures.KubeletPodResourcesDynamicResources, true)() mockDevicesProvider := podresourcetest.NewMockDevicesProvider(mockCtrl) mockPodsProvider := podresourcetest.NewMockPodsProvider(mockCtrl) mockCPUsProvider := podresourcetest.NewMockCPUsProvider(mockCtrl) @@ -754,7 +756,7 @@ func equalListResponse(respA, respB *podresourcesapi.ListPodResourcesResponse) b return false } - if !euqalDynamicResources(cntA.DynamicResources, cntB.DynamicResources) { + if !equalDynamicResources(cntA.DynamicResources, cntB.DynamicResources) { return false } } @@ -762,7 +764,7 @@ func equalListResponse(respA, respB *podresourcesapi.ListPodResourcesResponse) b return true } -func euqalDynamicResources(draResA, draResB []*podresourcesapi.DynamicResource) bool { +func equalDynamicResources(draResA, draResB []*podresourcesapi.DynamicResource) bool { if len(draResA) != len(draResB) { return false } @@ -801,6 +803,7 @@ func euqalDynamicResources(draResA, draResB []*podresourcesapi.DynamicResource) return true } + func equalContainerDevices(devA, devB []*podresourcesapi.ContainerDevices) bool { if len(devA) != len(devB) { return false @@ -890,7 +893,7 @@ func equalGetResponse(ResA, ResB *podresourcesapi.GetPodResourcesResponse) bool return false } - if !euqalDynamicResources(cntA.DynamicResources, cntB.DynamicResources) { + if !equalDynamicResources(cntA.DynamicResources, cntB.DynamicResources) { return false }