Remove SidecarContainer feature-gate check

Author: es-ma-n

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
 		}
 	}
 

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...)
 			}

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...)
 			}

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

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)