From 7005100dda5cd506d8181e3807680fad8b908b5b Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Wed, 29 Apr 2026 18:47:34 +0200 Subject: [PATCH] resolve more conflicts --- pkg/cluster/cluster.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go index 8e0b3c79f..dde95bd00 100644 --- a/pkg/cluster/cluster.go +++ b/pkg/cluster/cluster.go @@ -630,6 +630,12 @@ func (c *Cluster) compareContainers(description string, setA, setB []v1.Containe func(a, b v1.Container) bool { return !reflect.DeepEqual(a.SecurityContext, b.SecurityContext) }), newCheck("new %s's %s (index %d) volume mounts do not match the current one", func(a, b v1.Container) bool { return !compareVolumeMounts(a.VolumeMounts, b.VolumeMounts) }), + newCheck("new statefulset %s's %s (index %d) volume mounts do not match the current one", + func(a, b v1.Container) bool { return !reflect.DeepEqual(a.VolumeMounts, b.VolumeMounts) }), + newCheck("new statefulset %s's %s (index %d) readiness probe do not match the current one", + func(a, b v1.Container) bool { return !reflect.DeepEqual(a.ReadinessProbe, b.ReadinessProbe) }), + newCheck("new statefulset %s's %s (index %d) liveness probe do not match the current one", + func(a, b v1.Container) bool { return !reflect.DeepEqual(a.LivenessProbe, b.LivenessProbe) }), } if !c.OpConfig.EnableLazySpiloUpgrade {