fix: ensure rollout is triggered only when needed

This patch ensures that we trigger the rollout only needed, the only drawback is that we cannot evaluate the empty string Signed-off-by: Armando Ruocco <armando.ruocco@enterprisedb.com>
cloudnative-pg · May 18, 2023 · 3f47517 · 3f47517
1 parent b84527d
commit 3f47517
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/api/v1/cluster_types.go b/api/v1/cluster_types.go
@@ -550,6 +550,9 @@ type ClusterStatus struct {
 
 	// List of instance names in the cluster
 	InstanceNames []string `json:"instanceNames,omitempty"`
+
+	// LastObservedSchedulerName the last schedulerName reconciled from the spec
+	LastObservedSchedulerName string `json:"lastObservedSchedulerName,omitempty"`
 }
 
 // InstanceReportedState describes the last reported state of an instance during a reconciliation loop

diff --git a/controllers/cluster_upgrade.go b/controllers/cluster_upgrade.go
@@ -312,7 +312,7 @@ func IsPodNeedingRollout(status postgres.PostgresqlStatus, cluster *apiv1.Cluste
 
 // isPodNeedingUpdatedScheduler returns a boolean indicating if a restart is required and the relative message
 func isPodNeedingUpdatedScheduler(cluster *apiv1.Cluster, pod corev1.Pod) (bool, string) {
-	if pod.Spec.SchedulerName == cluster.Spec.SchedulerName {
+	if cluster.Spec.SchedulerName == "" || cluster.Spec.SchedulerName == pod.Spec.SchedulerName {
 		return false, ""
 	}