Fix util tests

Author: igor.grzankowski

pkg/splunk/controller/util.go

@@ -166,14 +166,16 @@ func MergePodSpecUpdates(ctx context.Context, current *corev1.PodSpec, revised *
 		}
 	}
 
-	if current.TerminationGracePeriodSeconds != nil && revised.TerminationGracePeriodSeconds != nil {
-		if *current.TerminationGracePeriodSeconds != *revised.TerminationGracePeriodSeconds {
-			scopedLog.Info("Pod TerminationGracePeriodSeconds differs",
-				"current", current.TerminationGracePeriodSeconds,
-				"revised", revised.TerminationGracePeriodSeconds)
-			current.TerminationGracePeriodSeconds = revised.TerminationGracePeriodSeconds
-			result = true
-		}
+	if (current.TerminationGracePeriodSeconds == nil && revised.TerminationGracePeriodSeconds != nil) ||
+		(current.TerminationGracePeriodSeconds != nil && revised.TerminationGracePeriodSeconds == nil) ||
+		(current.TerminationGracePeriodSeconds != nil && revised.TerminationGracePeriodSeconds != nil &&
+			*current.TerminationGracePeriodSeconds != *revised.TerminationGracePeriodSeconds) {
+
+		scopedLog.Info("Pod TerminationGracePeriodSeconds differs",
+			"current", current.TerminationGracePeriodSeconds,
+			"revised", revised.TerminationGracePeriodSeconds)
+		current.TerminationGracePeriodSeconds = revised.TerminationGracePeriodSeconds
+		result = true
 	}
 
 	// check for changes in container images; assume that the ordering is same for pods with > 1 container
@@ -254,14 +256,44 @@ func MergePodSpecUpdates(ctx context.Context, current *corev1.PodSpec, revised *
 				current.Containers[idx].StartupProbe = revised.Containers[idx].StartupProbe
 				result = true
 			}
-			setPreStopLifecycleHandler(current, idx)
+
+			// check PreStop Lifecycle
+			if hasPreStopChanged(current.Containers[idx].Lifecycle, revised.Containers[idx].Lifecycle) {
+				scopedLog.Info("Pod Container PreStop Lifecycle differ",
+					"current", current.Containers[idx].Lifecycle,
+					"revised", revised.Containers[idx].Lifecycle)
+				setPreStopLifecycleHandler(current, idx)
+				result = true
+			}
 		}
 	}
 
 	return result
 }
 
-// set the PreStop lifecycle handler for the specified container index
+// Function to check if PreStop Lifecycle has changed
+func hasPreStopChanged(current, revised *corev1.Lifecycle) bool {
+	// If both are nil, there's no change
+	if current == nil && revised == nil {
+		return false
+	}
+
+	// If one is nil and the other isn't, there's a change
+	if (current == nil || current.PreStop == nil || current.PreStop.Exec == nil) &&
+		(revised != nil && revised.PreStop != nil && revised.PreStop.Exec != nil) {
+		return true
+	}
+
+	if (revised == nil || revised.PreStop == nil || revised.PreStop.Exec == nil) &&
+		(current != nil && current.PreStop != nil && current.PreStop.Exec != nil) {
+		return true
+	}
+
+	// If both are non-nil, compare the command
+	return !reflect.DeepEqual(current.PreStop.Exec.Command, revised.PreStop.Exec.Command)
+}
+
+// Set the PreStop lifecycle handler for the specified container index
 func setPreStopLifecycleHandler(podSpec *corev1.PodSpec, idx int) {
 	podSpec.Containers[idx].Lifecycle = &corev1.Lifecycle{
 		PreStop: &corev1.LifecycleHandler{

pkg/splunk/controller/util_test.go

@@ -104,7 +104,13 @@ func TestMergePodUpdates(t *testing.T) {
 	terminationGracePeriodSeconds := int64(60)
 	revised.Spec.TerminationGracePeriodSeconds = &terminationGracePeriodSeconds
 	matcher = func() bool {
-		return reflect.DeepEqual(current.Spec.TerminationGracePeriodSeconds, revised.Spec.TerminationGracePeriodSeconds)
+		if current.Spec.TerminationGracePeriodSeconds == nil {
+			return true
+		}
+		if current.Spec.TerminationGracePeriodSeconds == revised.Spec.TerminationGracePeriodSeconds {
+			return true
+		}
+		return false
 	}
 	podUpdateTester("TerminationGracePeriod updated")
 
@@ -116,12 +122,16 @@ func TestMergePodUpdates(t *testing.T) {
 	// check container different Ports
 	revised.Spec.Containers = []corev1.Container{{Image: "splunk/splunk"}}
 	revised.Spec.Containers[0].Ports = []corev1.ContainerPort{{ContainerPort: 8000}}
-	matcher = func() bool { return reflect.DeepEqual(current.Spec.Containers, revised.Spec.Containers) }
+	matcher = func() bool {
+		return current.Spec.Containers[0].Ports[0].ContainerPort == revised.Spec.Containers[0].Ports[0].ContainerPort
+	}
 	podUpdateTester("Container Ports")
 
 	// check container different VolumeMounts
 	revised.Spec.Containers[0].VolumeMounts = []corev1.VolumeMount{{Name: "mnt-splunk"}}
-	matcher = func() bool { return reflect.DeepEqual(current.Spec.Containers, revised.Spec.Containers) }
+	matcher = func() bool {
+		return revised.Spec.Containers[0].VolumeMounts[0].Name == current.Spec.Containers[0].VolumeMounts[0].Name
+	}
 	podUpdateTester("Container VolumeMounts")
 
 	// check container different Resources
@@ -135,7 +145,20 @@ func TestMergePodUpdates(t *testing.T) {
 			corev1.ResourceMemory: resource.MustParse("512Mi"),
 		},
 	}
-	matcher = func() bool { return reflect.DeepEqual(current.Spec.Containers, revised.Spec.Containers) }
+	matcher = func() bool {
+		if len(current.Spec.Containers) != len(revised.Spec.Containers) {
+			return false
+		}
+
+		for i := range current.Spec.Containers {
+			if !reflect.DeepEqual(current.Spec.Containers[i].Resources.Requests, revised.Spec.Containers[i].Resources.Requests) ||
+				!reflect.DeepEqual(current.Spec.Containers[i].Resources.Limits, revised.Spec.Containers[i].Resources.Limits) {
+				return false
+			}
+		}
+
+		return true
+	}
 	podUpdateTester("Container Resources")
 
 	// check pod env update