Merge pull request kubernetes#116742 from moshe010/fix-pod-resource-a…

…pi-ut kubelet PodResources API: follow-up review comments
openshift · Jun 6, 2023 · 3d4a243 · 3d4a243
2 parents 299b72c + 1031977
commit 3d4a243
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git 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
@@ -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,15 +756,15 @@ func equalListResponse(respA, respB *podresourcesapi.ListPodResourcesResponse) b
 				return false
 			}
 
-			if !euqalDynamicResources(cntA.DynamicResources, cntB.DynamicResources) {
+			if !equalDynamicResources(cntA.DynamicResources, cntB.DynamicResources) {
 				return false
 			}
 		}
 	}
 	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
 		}