Skip to content

Commit 99dcf07

Browse files
committed
If ResourceRequirements changed, always mark a proposed resize
1 parent bf4f183 commit 99dcf07

File tree

2 files changed

+190
-361
lines changed

2 files changed

+190
-361
lines changed

pkg/api/pod/util.go

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,26 +1297,17 @@ func MarkPodProposedForResize(oldPod, newPod *api.Pod) {
12971297
}
12981298

12991299
for i, c := range newPod.Spec.Containers {
1300+
if c.Name != oldPod.Spec.Containers[i].Name {
1301+
return // Update is invalid (container mismatch): let validation handle it.
1302+
}
13001303
if c.Resources.Requests == nil {
13011304
continue
13021305
}
13031306
if cmp.Equal(oldPod.Spec.Containers[i].Resources, c.Resources) {
13041307
continue
13051308
}
1306-
findContainerStatus := func(css []api.ContainerStatus, cName string) (api.ContainerStatus, bool) {
1307-
for i := range css {
1308-
if css[i].Name == cName {
1309-
return css[i], true
1310-
}
1311-
}
1312-
return api.ContainerStatus{}, false
1313-
}
1314-
if cs, ok := findContainerStatus(newPod.Status.ContainerStatuses, c.Name); ok {
1315-
if !cmp.Equal(c.Resources.Requests, cs.AllocatedResources) {
1316-
newPod.Status.Resize = api.PodResizeStatusProposed
1317-
break
1318-
}
1319-
}
1309+
newPod.Status.Resize = api.PodResizeStatusProposed
1310+
return
13201311
}
13211312
}
13221313

0 commit comments

Comments
 (0)