github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 11:38:15 +00:00
Code Issues Projects Releases Wiki Activity

Resolved some review comments

Browse Source
This commit is contained in:
vivzbansal 2025-01-07 07:21:25 +00:00
parent c479f007d8
commit c31b1b3332
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/apis/core/validation/validation.go
View File

@ -5657,23 +5657,23 @@ func ValidatePodResize(newPod, oldPod *core.Pod, opts PodValidationOptions) fiel
dropCPUMemoryResourcesFromContainer(&container, &oldPod.Spec.InitContainers[ix]) dropCPUMemoryResourcesFromContainer(&container, &oldPod.Spec.InitContainers[ix])
if !apiequality.Semantic.DeepEqual(container, oldPod.Spec.InitContainers[ix]) { if !apiequality.Semantic.DeepEqual(container, oldPod.Spec.InitContainers[ix]) {
// This likely means that the user has made changes to resources other than CPU and memory for sidecar container. // This likely means that the user has made changes to resources other than CPU and memory for sidecar container.
specDiff := cmp.Diff(oldPod.Spec.InitContainers[ix], container) errs := field.Forbidden(specPath, "only cpu and memory resources for sidecar containers are mutable")
errs := field.Forbidden(specPath, fmt.Sprintf("only cpu and memory resources for sidecar containers are mutable\n%v", specDiff))
allErrs = append(allErrs, errs) allErrs = append(allErrs, errs)
return allErrs
} }
} else if !apiequality.Semantic.DeepEqual(container, oldPod.Spec.InitContainers[ix]) { // non-restartable init container } else if !apiequality.Semantic.DeepEqual(container, oldPod.Spec.InitContainers[ix]) { // non-restartable init container
// This likely means that the user has modified resources of non-sidecar init container. // This likely means that the user has modified resources of non-sidecar init container.
specDiff := cmp.Diff(oldPod.Spec.InitContainers[ix], container) errs := field.Forbidden(specPath, "resources for non-sidecar init containers are immutable")
errs := field.Forbidden(specPath, fmt.Sprintf("resources for non-sidecar init containers are immutable\n%v", specDiff))
allErrs = append(allErrs, errs) allErrs = append(allErrs, errs)
return allErrs
} }
newInitContainers = append(newInitContainers, container) newInitContainers = append(newInitContainers, container)
} }
originalCPUMemPodSpec.InitContainers = newInitContainers originalCPUMemPodSpec.InitContainers = newInitContainers
} }
if len(allErrs) > 0 {
return allErrs
}
if !apiequality.Semantic.DeepEqual(originalCPUMemPodSpec, oldPod.Spec) { if !apiequality.Semantic.DeepEqual(originalCPUMemPodSpec, oldPod.Spec) {
// This likely means that the user has made changes to resources other than CPU and Memory. // This likely means that the user has made changes to resources other than CPU and Memory.
specDiff := cmp.Diff(oldPod.Spec, originalCPUMemPodSpec) specDiff := cmp.Diff(oldPod.Spec, originalCPUMemPodSpec)

3
pkg/kubelet/kubelet_pods_test.go
View File

@ -6881,6 +6881,9 @@ func TestAllocatedResourcesMatchStatus(t *testing.T) {
for _, test := range tests { for _, test := range tests {
for _, isSidecarContainer := range []bool{false, true} { for _, isSidecarContainer := range []bool{false, true} {
if isSidecarContainer {
test.name += " " + "for sidecar containers"
}
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
var podStatus *kubecontainer.PodStatus var podStatus *kubecontainer.PodStatus
state := kubecontainer.ContainerStateRunning state := kubecontainer.ContainerStateRunning