github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Remove feature-gate checks for SidecarContainers(GA)
This commit is contained in:
Kubernetes Prow Robot 2025-03-20 01:36:42 -07:00 committed by GitHub
commit 10bdb0a155
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/allocation/allocation_manager.go
View File

@ -164,12 +164,10 @@ func allocationFromPod(pod *v1.Pod) state.PodResourceInfo {
podAlloc.ContainerResources[container.Name] = alloc podAlloc.ContainerResources[container.Name] = alloc
} }
if utilfeature.DefaultFeatureGate.Enabled(features.SidecarContainers) { for _, container := range pod.Spec.InitContainers {
for _, container := range pod.Spec.InitContainers { if podutil.IsRestartableInitContainer(&container) {
if podutil.IsRestartableInitContainer(&container) { alloc := *container.Resources.DeepCopy()
alloc := *container.Resources.DeepCopy() podAlloc.ContainerResources[container.Name] = alloc
podAlloc.ContainerResources[container.Name] = alloc
}
} }
} }

2
pkg/kubelet/cm/cpumanager/policy_static.go
View File

@ -474,7 +474,7 @@ func (p *staticPolicy) guaranteedCPUs(pod *v1.Pod, container *v1.Container) int
// and the value configured with runtime. // and the value configured with runtime.
if utilfeature.DefaultFeatureGate.Enabled(features.InPlacePodVerticalScaling) { if utilfeature.DefaultFeatureGate.Enabled(features.InPlacePodVerticalScaling) {
containerStatuses := pod.Status.ContainerStatuses containerStatuses := pod.Status.ContainerStatuses
if utilfeature.DefaultFeatureGate.Enabled(features.SidecarContainers) && podutil.IsRestartableInitContainer(container) { if podutil.IsRestartableInitContainer(container) {
if len(pod.Status.InitContainerStatuses) != 0 { if len(pod.Status.InitContainerStatuses) != 0 {
containerStatuses = append(containerStatuses, pod.Status.InitContainerStatuses...) containerStatuses = append(containerStatuses, pod.Status.InitContainerStatuses...)
} }

2
pkg/kubelet/cm/memorymanager/policy_static.go
View File

@ -451,7 +451,7 @@ func getRequestedResources(pod *v1.Pod, container *v1.Container) (map[v1.Resourc
// and the value configured with runtime. // and the value configured with runtime.
if utilfeature.DefaultFeatureGate.Enabled(features.InPlacePodVerticalScaling) { if utilfeature.DefaultFeatureGate.Enabled(features.InPlacePodVerticalScaling) {
containerStatuses := pod.Status.ContainerStatuses containerStatuses := pod.Status.ContainerStatuses
if utilfeature.DefaultFeatureGate.Enabled(features.SidecarContainers) && podutil.IsRestartableInitContainer(container) { if podutil.IsRestartableInitContainer(container) {
if len(pod.Status.InitContainerStatuses) != 0 { if len(pod.Status.InitContainerStatuses) != 0 {
containerStatuses = append(containerStatuses, pod.Status.InitContainerStatuses...) containerStatuses = append(containerStatuses, pod.Status.InitContainerStatuses...)
} }

1
pkg/kubelet/kubelet_test.go
View File

@ -2617,7 +2617,6 @@ func TestHandlePodResourcesResize(t *testing.T) {
t.Skip("InPlacePodVerticalScaling is not currently supported for Windows") t.Skip("InPlacePodVerticalScaling is not currently supported for Windows")
} }
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.InPlacePodVerticalScaling, true) featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.InPlacePodVerticalScaling, true)
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.SidecarContainers, true)
testKubelet := newTestKubelet(t, false) testKubelet := newTestKubelet(t, false)
defer testKubelet.Cleanup() defer testKubelet.Cleanup()
kubelet := testKubelet.kubelet kubelet := testKubelet.kubelet

1
pkg/kubelet/kuberuntime/kuberuntime_manager_test.go
View File

@ -2926,7 +2926,6 @@ func TestComputePodActionsForPodResize(t *testing.T) {
func TestUpdatePodContainerResources(t *testing.T) { func TestUpdatePodContainerResources(t *testing.T) {
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.InPlacePodVerticalScaling, true) featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.InPlacePodVerticalScaling, true)
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.SidecarContainers, true)
fakeRuntime, _, m, err := createTestRuntimeManager() fakeRuntime, _, m, err := createTestRuntimeManager()
m.machineInfo.MemoryCapacity = 17179860387 // 16GB m.machineInfo.MemoryCapacity = 17179860387 // 16GB
assert.NoError(t, err) assert.NoError(t, err)