Merge pull request #54 from cybozu-go/fix-namespaces-order

Sort namespace in generated configmaps
cybozu-go · Jun 28, 2024 · 9e85ecf · 9e85ecf
2 parents 66ae9c9 + dd6e5d9
commit 9e85ecf
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/controllers/tenant_controller.go b/controllers/tenant_controller.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"slices"
 	"strings"
 	"text/template"
 
@@ -611,6 +612,7 @@ func (r *TenantReconciler) updateConfigMap(ctx context.Context, controllerName s
 			namespaces = append(namespaces, ns.Name)
 		}
 	}
+	slices.Sort(namespaces)
 
 	op, err := ctrl.CreateOrUpdate(ctx, r.client, cm, func() error {
 		cm.Labels = map[string]string{
@@ -635,7 +637,7 @@ func (r *TenantReconciler) updateConfigMap(ctx context.Context, controllerName s
 		return err
 	}
 	if op != controllerutil.OperationResultNone {
-		logger.Info("ConfigMap successfully reconciled")
+		logger.Info("ConfigMap successfully reconciled", "namespaces", namespaces)
 	}
 
 	return nil
@@ -665,6 +667,7 @@ func (r *TenantReconciler) updateAllTenantNamespacesConfigMap(ctx context.Contex
 			allNamespaces = append(allNamespaces, ns.Name)
 		}
 	}
+	slices.Sort(allNamespaces)
 
 	op, err := ctrl.CreateOrUpdate(ctx, r.client, cm, func() error {
 		cm.Labels = map[string]string{
@@ -688,7 +691,7 @@ func (r *TenantReconciler) updateAllTenantNamespacesConfigMap(ctx context.Contex
 		return err
 	}
 	if op != controllerutil.OperationResultNone {
-		logger.Info("ConfigMap successfully reconciled")
+		logger.Info("ConfigMap successfully reconciled", "allNamespaces", allNamespaces)
 	}
 
 	return nil