diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go index 7c55cc314ef..ec9b9d35a13 100644 --- a/pkg/kubelet/kubelet_pods.go +++ b/pkg/kubelet/kubelet_pods.go @@ -1740,19 +1740,6 @@ func getPhase(pod *v1.Pod, info []v1.ContainerStatus, podIsTerminal bool) v1.Pod } } -func deleteCustomResourceFromResourceRequirements(target *v1.ResourceRequirements) { - for resource := range target.Limits { - if resource != v1.ResourceCPU && resource != v1.ResourceMemory && resource != v1.ResourceEphemeralStorage { - delete(target.Limits, resource) - } - } - for resource := range target.Requests { - if resource != v1.ResourceCPU && resource != v1.ResourceMemory && resource != v1.ResourceEphemeralStorage { - delete(target.Requests, resource) - } - } -} - func (kl *Kubelet) determinePodResizeStatus(allocatedPod *v1.Pod, podStatus *kubecontainer.PodStatus) v1.PodResizeStatus { var podResizeStatus v1.PodResizeStatus if allocatedResourcesMatchStatus(allocatedPod, podStatus) { diff --git a/pkg/kubelet/kubelet_pods_test.go b/pkg/kubelet/kubelet_pods_test.go index b18b851aa30..d4aab600b18 100644 --- a/pkg/kubelet/kubelet_pods_test.go +++ b/pkg/kubelet/kubelet_pods_test.go @@ -6631,7 +6631,7 @@ func TestAllocatedResourcesMatchStatus(t *testing.T) { podStatus := &kubecontainer.PodStatus{ Name: "test", ContainerStatuses: []*kubecontainer.Status{ - &kubecontainer.Status{ + { Name: "c", State: state, Resources: test.statusResources, diff --git a/test/featuregates_linter/test_data/versioned_feature_list.yaml b/test/featuregates_linter/test_data/versioned_feature_list.yaml index ca7fdf1590c..a868becf4b9 100644 --- a/test/featuregates_linter/test_data/versioned_feature_list.yaml +++ b/test/featuregates_linter/test_data/versioned_feature_list.yaml @@ -508,6 +508,12 @@ lockToDefault: false preRelease: Alpha version: "1.27" +- name: InPlacePodVerticalScalingAllocatedStatus + versionedSpecs: + - default: false + lockToDefault: false + preRelease: Alpha + version: "1.32" - name: InTreePluginPortworxUnregister versionedSpecs: - default: false