Merge pull request kubernetes#130768 from es-ma-n/es-ma-n-remove-sidecar-feature-gate-check

k8s-ci-robot · web-flow · commit 10bdb0a155cd · 2025-03-20T01:36:42.000-07:00
Remove feature-gate checks for SidecarContainers(GA)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -2926,7 +2926,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)

Original file line number	Diff line number	Diff line change
`@@ -164,12 +164,10 @@ func allocationFromPod(pod *v1.Pod) state.PodResourceInfo {`
`164`	`164`	`podAlloc.ContainerResources[container.Name] = alloc`
`165`	`165`	`}`
`166`	`166`
`167`		`- if utilfeature.DefaultFeatureGate.Enabled(features.SidecarContainers) {`
`168`		`- for _, container := range pod.Spec.InitContainers {`
`169`		`- if podutil.IsRestartableInitContainer(&container) {`
`170`		`- alloc := *container.Resources.DeepCopy()`
`171`		`- podAlloc.ContainerResources[container.Name] = alloc`
`172`		`- }`
	`167`	`+ for _, container := range pod.Spec.InitContainers {`
	`168`	`+ if podutil.IsRestartableInitContainer(&container) {`
	`169`	`+ alloc := *container.Resources.DeepCopy()`
	`170`	`+ podAlloc.ContainerResources[container.Name] = alloc`
`173`	`171`	`}`
`174`	`172`	`}`
`175`	`173`
Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ func (p staticPolicy) guaranteedCPUs(pod v1.Pod, container *v1.Container) int`
`474`	`474`	`// and the value configured with runtime.`
`475`	`475`	`if utilfeature.DefaultFeatureGate.Enabled(features.InPlacePodVerticalScaling) {`
`476`	`476`	`containerStatuses := pod.Status.ContainerStatuses`
`477`		`- if utilfeature.DefaultFeatureGate.Enabled(features.SidecarContainers) && podutil.IsRestartableInitContainer(container) {`
	`477`	`+ if podutil.IsRestartableInitContainer(container) {`
`478`	`478`	`if len(pod.Status.InitContainerStatuses) != 0 {`
`479`	`479`	`containerStatuses = append(containerStatuses, pod.Status.InitContainerStatuses...)`
`480`	`480`	`}`
Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ func getRequestedResources(pod v1.Pod, container v1.Container) (map[v1.Resourc`
`451`	`451`	`// and the value configured with runtime.`
`452`	`452`	`if utilfeature.DefaultFeatureGate.Enabled(features.InPlacePodVerticalScaling) {`
`453`	`453`	`containerStatuses := pod.Status.ContainerStatuses`
`454`		`- if utilfeature.DefaultFeatureGate.Enabled(features.SidecarContainers) && podutil.IsRestartableInitContainer(container) {`
	`454`	`+ if podutil.IsRestartableInitContainer(container) {`
`455`	`455`	`if len(pod.Status.InitContainerStatuses) != 0 {`
`456`	`456`	`containerStatuses = append(containerStatuses, pod.Status.InitContainerStatuses...)`
`457`	`457`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2617,7 +2617,6 @@ func TestHandlePodResourcesResize(t *testing.T) {`
`2617`	`2617`	`t.Skip("InPlacePodVerticalScaling is not currently supported for Windows")`
`2618`	`2618`	`}`
`2619`	`2619`	`featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.InPlacePodVerticalScaling, true)`
`2620`		`- featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.SidecarContainers, true)`
`2621`	`2620`	`testKubelet := newTestKubelet(t, false)`
`2622`	`2621`	`defer testKubelet.Cleanup()`
`2623`	`2622`	`kubelet := testKubelet.kubelet`