fix(cpo): initialize nil resource requests map before applying overrides

The applyRequestsOverrides function panics with "assignment to entry in
nil map" when a resource-request-override annotation targets a container
that has no existing Resources.Requests map. This adds a nil guard to
initialize the map before calling maps.Copy, matching the pattern already
used for Resources.Limits in applyNonOvercommitableResourceLimits.

Signed-off-by: OpenShift CI Bot <ci-bot@redhat.com>

Author: OpenShift CI Bot

support/controlplane-component/defaults.go

@@ -426,12 +426,18 @@ func (c *controlPlaneWorkload[T]) applyRequestsOverrides(podTemplate *corev1.Pod
 
 	for i, c := range podTemplate.Spec.InitContainers {
 		if res, ok := requestsOverrides[c.Name]; ok {
+			if podTemplate.Spec.InitContainers[i].Resources.Requests == nil {
+				podTemplate.Spec.InitContainers[i].Resources.Requests = corev1.ResourceList{}
+			}
 			maps.Copy(podTemplate.Spec.InitContainers[i].Resources.Requests, res)
 			applyNonOvercommitableResourceLimits(&podTemplate.Spec.InitContainers[i], res)
 		}
 	}
 	for i, c := range podTemplate.Spec.Containers {
 		if res, ok := requestsOverrides[c.Name]; ok {
+			if podTemplate.Spec.Containers[i].Resources.Requests == nil {
+				podTemplate.Spec.Containers[i].Resources.Requests = corev1.ResourceList{}
+			}
 			maps.Copy(podTemplate.Spec.Containers[i].Resources.Requests, res)
 			applyNonOvercommitableResourceLimits(&podTemplate.Spec.Containers[i], res)
 		}

support/controlplane-component/defaults_test.go

@@ -408,6 +408,52 @@ func TestApplyRequestsOverrides(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "When overriding a container with nil resource requests it should initialize the map and apply overrides",
+			annotations: map[string]string{
+				"resource-request-override.hypershift.openshift.io/router.router": "cpu=500m,memory=1Gi",
+			},
+			containers: []corev1.Container{
+				{
+					Name: "router",
+				},
+			},
+			expectedContainers: []corev1.Container{
+				{
+					Name: "router",
+					Resources: corev1.ResourceRequirements{
+						Requests: corev1.ResourceList{
+							corev1.ResourceCPU:    resource.MustParse("500m"),
+							corev1.ResourceMemory: resource.MustParse("1Gi"),
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "When overriding an init container with nil resource requests it should initialize the map and apply overrides",
+			annotations: map[string]string{
+				"resource-request-override.hypershift.openshift.io/router.wait-for-etcd": "aro.openshift.io/swift-nic=1",
+			},
+			initContainers: []corev1.Container{
+				{
+					Name: "wait-for-etcd",
+				},
+			},
+			expectedInitContainers: []corev1.Container{
+				{
+					Name: "wait-for-etcd",
+					Resources: corev1.ResourceRequirements{
+						Requests: corev1.ResourceList{
+							aroSwiftNICResource: resource.MustParse("1"),
+						},
+						Limits: corev1.ResourceList{
+							aroSwiftNICResource: resource.MustParse("1"),
+						},
+					},
+				},
+			},
+		},
 		{
 			name: "When annotation targets a different deployment it should not apply overrides",
 			annotations: map[string]string{