Fix conversion routines (#1088)

* Fix conversion routines

* update pool golden files

Author: andrewstucki

operator/api/redpanda/v1alpha2/conversion/helpers.go

@@ -108,6 +108,9 @@ func convertInitContainer(state *redpanda.RenderState, values *redpanda.Values,
 	}
 
 	container := containerOrInit(&values.Statefulset.PodTemplate.Spec.InitContainers, name)
+	if container.Resources == nil {
+		container.Resources = &applycorev1.ResourceRequirementsApplyConfiguration{}
+	}
 	if err := convertJSONNotNil(spec.GetResources(), container.Resources); err != nil {
 		return err
 	}

operator/api/redpanda/v1alpha2/conversion/to_render.go

@@ -182,6 +182,16 @@ func convertStatefulsetV2Fields(state *redpanda.RenderState, values *redpanda.Va
 		values.Statefulset.PodTemplate.Spec.TerminationGracePeriodSeconds = ptr.To(int64(*spec.TerminationGracePeriodSeconds))
 	}
 
+	if redpandaContainer.LivenessProbe == nil {
+		redpandaContainer.LivenessProbe = &applycorev1.ProbeApplyConfiguration{}
+	}
+	if redpandaContainer.StartupProbe == nil {
+		redpandaContainer.StartupProbe = &applycorev1.ProbeApplyConfiguration{}
+	}
+	if sidecarContainer.ReadinessProbe == nil {
+		sidecarContainer.ReadinessProbe = &applycorev1.ProbeApplyConfiguration{}
+	}
+
 	if err := convertJSONNotNil(spec.LivenessProbe, redpandaContainer.LivenessProbe); err != nil {
 		return err
 	}
@@ -191,12 +201,14 @@ func convertStatefulsetV2Fields(state *redpanda.RenderState, values *redpanda.Va
 	if err := convertJSONNotNil(spec.ReadinessProbe, sidecarContainer.ReadinessProbe); err != nil {
 		return err
 	}
+
 	if err := convertAndAppendJSONNotNil(spec.Tolerations, &values.Statefulset.PodTemplate.Spec.Tolerations); err != nil {
 		return err
 	}
 	if err := convertAndAppendJSONNotNil(spec.TopologySpreadConstraints, &values.Statefulset.PodTemplate.Spec.TopologySpreadConstraints); err != nil {
 		return err
 	}
+
 	if values.Statefulset.PodTemplate.Spec.Affinity == nil {
 		values.Statefulset.PodTemplate.Spec.Affinity = &applycorev1.AffinityApplyConfiguration{}
 	}
@@ -277,6 +289,14 @@ func convertStatefulsetSidecarV2Fields(state *redpanda.RenderState, values *redp
 	if err := convertAndAppendYAMLNotNil(state, spec.ExtraVolumeMounts, &sidecarContainer.VolumeMounts); err != nil {
 		return err
 	}
+
+	if sidecarContainer.Resources == nil {
+		sidecarContainer.Resources = &applycorev1.ResourceRequirementsApplyConfiguration{}
+	}
+	if sidecarContainer.SecurityContext == nil {
+		sidecarContainer.SecurityContext = &applycorev1.SecurityContextApplyConfiguration{}
+	}
+
 	if err := convertJSONNotNil(spec.Resources, sidecarContainer.Resources); err != nil {
 		return err
 	}

operator/internal/lifecycle/testdata/cases.pools.golden.txtar

@@ -188,6 +188,7 @@
             periodSeconds: 10
             successThreshold: 1
           resources: {}
+          securityContext: {}
           volumeMounts:
           - mountPath: /etc/tls/certs/default
             name: redpanda-default-cert
@@ -547,7 +548,11 @@
             initialDelaySeconds: 1
             periodSeconds: 10
             successThreshold: 1
-          resources: {}
+          resources:
+            requests:
+              cpu: 16m
+              memory: 256Mi
+          securityContext: {}
           volumeMounts:
           - mountPath: /etc/tls/certs/default
             name: redpanda-default-cert
@@ -1373,6 +1378,7 @@
             periodSeconds: 10
             successThreshold: 1
           resources: {}
+          securityContext: {}
           volumeMounts:
           - mountPath: /etc/tls/certs/default
             name: redpanda-default-cert

operator/internal/lifecycle/testdata/cases.txtar

@@ -19,6 +19,11 @@ spec:
   clusterSpec:
     statefulset:
       replicas: 0
+      sideCars:
+        resources:
+          requests:
+            cpu: 16m
+            memory: 256Mi
 ---
 apiVersion: cluster.redpanda.com/v1alpha2
 kind: NodePool

operator/internal/lifecycle/testdata/cases.values.golden.txtar

@@ -320,8 +320,12 @@ values:
         containers:
         - name: redpanda
         - name: sidecar
+          readinessProbe: {}
+          resources: {}
+          securityContext: {}
         initContainers:
         - name: redpanda-configurator
+          resources: {}
         priorityClassName: ""
         securityContext: {}
         terminationGracePeriodSeconds: 90
@@ -908,8 +912,15 @@ values:
         containers:
         - name: redpanda
         - name: sidecar
+          readinessProbe: {}
+          resources:
+            requests:
+              cpu: 16m
+              memory: 256Mi
+          securityContext: {}
         initContainers:
         - name: redpanda-configurator
+          resources: {}
         priorityClassName: ""
         securityContext: {}
         terminationGracePeriodSeconds: 90
@@ -1411,8 +1422,12 @@ values:
         containers:
         - name: redpanda
         - name: sidecar
+          readinessProbe: {}
+          resources: {}
+          securityContext: {}
         initContainers:
         - name: redpanda-configurator
+          resources: {}
         priorityClassName: ""
         securityContext: {}
         terminationGracePeriodSeconds: 90