Merge pull request #1649 from stuggi/stable_condition

Sort template names before reconciliation to ensure consistent condition messages

Author: openshift-merge-bot[bot]

pkg/openstack/galera.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"reflect"
+	"sort"
 	"strings"
 
 	certmgrv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
@@ -102,7 +103,15 @@ func ReconcileGaleras(
 	// List of conditions to consider later for mirroring
 	conditions := condition.Conditions{}
 
-	for name, spec := range *instance.Spec.Galera.Templates {
+	// Sort template names to ensure consistent ordering
+	templateNames := make([]string, 0, len(*instance.Spec.Galera.Templates))
+	for name := range *instance.Spec.Galera.Templates {
+		templateNames = append(templateNames, name)
+	}
+	sort.Strings(templateNames)
+
+	for _, name := range templateNames {
+		spec := (*instance.Spec.Galera.Templates)[name]
 		hostname := fmt.Sprintf("%s.%s.svc", name, instance.Namespace)
 		hostnameHeadless := fmt.Sprintf("%s-galera.%s.svc", name, instance.Namespace)
 

pkg/openstack/memcached.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"reflect"
+	"sort"
 	"strings"
 
 	certmgrv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
@@ -97,7 +98,16 @@ func ReconcileMemcacheds(
 	var ctrlResult ctrl.Result
 	var err error
 	var status memcachedStatus
-	for name, spec := range *instance.Spec.Memcached.Templates {
+
+	// Sort template names to ensure consistent ordering
+	templateNames := make([]string, 0, len(*instance.Spec.Memcached.Templates))
+	for name := range *instance.Spec.Memcached.Templates {
+		templateNames = append(templateNames, name)
+	}
+	sort.Strings(templateNames)
+
+	for _, name := range templateNames {
+		spec := (*instance.Spec.Memcached.Templates)[name]
 		var memcached *memcachedv1.Memcached
 
 		status, memcached, ctrlResult, err = reconcileMemcached(ctx, instance, version, helper, name, &spec)

pkg/openstack/rabbitmq.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"sort"
 	"strings"
 
 	certmgrv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
@@ -104,7 +105,15 @@ func ReconcileRabbitMQs(
 		instance.Spec.Rabbitmq.Templates = ptr.To(map[string]rabbitmqv1.RabbitMqSpecCore{})
 	}
 
-	for name, spec := range *instance.Spec.Rabbitmq.Templates {
+	// Sort template names to ensure consistent ordering
+	templateNames := make([]string, 0, len(*instance.Spec.Rabbitmq.Templates))
+	for name := range *instance.Spec.Rabbitmq.Templates {
+		templateNames = append(templateNames, name)
+	}
+	sort.Strings(templateNames)
+
+	for _, name := range templateNames {
+		spec := (*instance.Spec.Rabbitmq.Templates)[name]
 		status, ctrlResult, err = reconcileRabbitMQ(ctx, instance, version, helper, name, spec)
 
 		switch status {

pkg/openstack/redis.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"reflect"
+	"sort"
 	"strings"
 
 	certmgrv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
@@ -114,7 +115,15 @@ func ReconcileRedis(
 	var err error
 	var status redisStatus
 
-	for name, spec := range *instance.Spec.Redis.Templates {
+	// Sort template names to ensure consistent ordering
+	templateNames := make([]string, 0, len(*instance.Spec.Redis.Templates))
+	for name := range *instance.Spec.Redis.Templates {
+		templateNames = append(templateNames, name)
+	}
+	sort.Strings(templateNames)
+
+	for _, name := range templateNames {
+		spec := (*instance.Spec.Redis.Templates)[name]
 		var redis *redisv1.Redis
 
 		status, redis, ctrlResult, err = reconcileRedis(ctx, instance, version, helper, name, &spec)