From bfaa2496b2fedf4b01f970c56a0ef7186ef05f9f Mon Sep 17 00:00:00 2001 From: euiseok Date: Thu, 13 Mar 2025 14:48:24 +0900 Subject: [PATCH] Remove SidecarContainer feature-gate check --- pkg/kubelet/allocation/allocation_manager.go | 10 ++++------ pkg/kubelet/cm/cpumanager/policy_static.go | 2 +- pkg/kubelet/cm/memorymanager/policy_static.go | 2 +- pkg/kubelet/kubelet_test.go | 1 - pkg/kubelet/kuberuntime/kuberuntime_manager_test.go | 1 - 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/pkg/kubelet/allocation/allocation_manager.go b/pkg/kubelet/allocation/allocation_manager.go index 0444d16728f..5287ba169b1 100644 --- a/pkg/kubelet/allocation/allocation_manager.go +++ b/pkg/kubelet/allocation/allocation_manager.go @@ -164,12 +164,10 @@ func allocationFromPod(pod *v1.Pod) state.PodResourceInfo { podAlloc.ContainerResources[container.Name] = alloc } - if utilfeature.DefaultFeatureGate.Enabled(features.SidecarContainers) { - for _, container := range pod.Spec.InitContainers { - if podutil.IsRestartableInitContainer(&container) { - alloc := *container.Resources.DeepCopy() - podAlloc.ContainerResources[container.Name] = alloc - } + for _, container := range pod.Spec.InitContainers { + if podutil.IsRestartableInitContainer(&container) { + alloc := *container.Resources.DeepCopy() + podAlloc.ContainerResources[container.Name] = alloc } } diff --git a/pkg/kubelet/cm/cpumanager/policy_static.go b/pkg/kubelet/cm/cpumanager/policy_static.go index e183d71e4a6..28591c5baf1 100644 --- a/pkg/kubelet/cm/cpumanager/policy_static.go +++ b/pkg/kubelet/cm/cpumanager/policy_static.go @@ -474,7 +474,7 @@ func (p *staticPolicy) guaranteedCPUs(pod *v1.Pod, container *v1.Container) int // and the value configured with runtime. if utilfeature.DefaultFeatureGate.Enabled(features.InPlacePodVerticalScaling) { containerStatuses := pod.Status.ContainerStatuses - if utilfeature.DefaultFeatureGate.Enabled(features.SidecarContainers) && podutil.IsRestartableInitContainer(container) { + if podutil.IsRestartableInitContainer(container) { if len(pod.Status.InitContainerStatuses) != 0 { containerStatuses = append(containerStatuses, pod.Status.InitContainerStatuses...) } diff --git a/pkg/kubelet/cm/memorymanager/policy_static.go b/pkg/kubelet/cm/memorymanager/policy_static.go index f68475e42a1..eabbab23649 100644 --- a/pkg/kubelet/cm/memorymanager/policy_static.go +++ b/pkg/kubelet/cm/memorymanager/policy_static.go @@ -451,7 +451,7 @@ func getRequestedResources(pod *v1.Pod, container *v1.Container) (map[v1.Resourc // and the value configured with runtime. if utilfeature.DefaultFeatureGate.Enabled(features.InPlacePodVerticalScaling) { containerStatuses := pod.Status.ContainerStatuses - if utilfeature.DefaultFeatureGate.Enabled(features.SidecarContainers) && podutil.IsRestartableInitContainer(container) { + if podutil.IsRestartableInitContainer(container) { if len(pod.Status.InitContainerStatuses) != 0 { containerStatuses = append(containerStatuses, pod.Status.InitContainerStatuses...) } diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index c8e3500d6d6..6a378742069 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -2617,7 +2617,6 @@ func TestHandlePodResourcesResize(t *testing.T) { t.Skip("InPlacePodVerticalScaling is not currently supported for Windows") } featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.InPlacePodVerticalScaling, true) - featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.SidecarContainers, true) testKubelet := newTestKubelet(t, false) defer testKubelet.Cleanup() kubelet := testKubelet.kubelet diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go b/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go index baf0a6de8f6..01f67b2db3d 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go @@ -2919,7 +2919,6 @@ func TestComputePodActionsForPodResize(t *testing.T) { func TestUpdatePodContainerResources(t *testing.T) { featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.InPlacePodVerticalScaling, true) - featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.SidecarContainers, true) fakeRuntime, _, m, err := createTestRuntimeManager() m.machineInfo.MemoryCapacity = 17179860387 // 16GB assert.NoError(t, err)