PR feedback and adding comments (#3741)

config/crd/bases/postgres-operator.crunchydata.com_pgadmins.yaml

@@ -39,7 +39,8 @@ spec:
             properties:
               adminUsername:
                 description: AdminUsername is the username to set during pgAdmin startup.
-                  pgAdmin requires this to have a valid email form.
+                  pgAdmin requires this to have a valid email form in order to log
+                  in. Once set, this cannot be changed.
                 type: string
               affinity:
                 description: 'Scheduling constraints of the PGAdmin pod. More info:

internal/controller/standalone_pgadmin/configmap.go

@@ -147,15 +147,12 @@ func generateClusterConfig(
 	sort.Strings(keys)
 
 	clusterServers := map[int]any{}
-	// Because we allow multiple ServerGroups to be defined, we use `currentOffset` to keep
-	// track of the last number added to the `Servers` group
-	var currentOffset = 0
 	for _, serverGroupName := range keys {
 		sort.Slice(clusters[serverGroupName].Items,
 			func(i, j int) bool {
 				return clusters[serverGroupName].Items[i].Name < clusters[serverGroupName].Items[j].Name
 			})
-		for i, cluster := range clusters[serverGroupName].Items {
+		for _, cluster := range clusters[serverGroupName].Items {
 			object := map[string]any{
 				"Name":          cluster.Name,
 				"Group":         serverGroupName,
@@ -167,9 +164,8 @@ func generateClusterConfig(
 				"SSLMode": "prefer",
 				"Shared":  true,
 			}
-			clusterServers[i+1+currentOffset] = object
+			clusterServers[len(clusterServers)+1] = object
 		}
-		currentOffset = len(clusters[serverGroupName].Items) + currentOffset
 	}
 	servers := map[string]any{
 		"Servers": clusterServers,

internal/controller/standalone_pgadmin/postgrescluster.go

@@ -44,7 +44,7 @@ func (r *PGAdminReconciler) findPGAdminsForPostgresCluster(
 	}) == nil {
 		for i := range pgadmins.Items {
 			for _, serverGroup := range pgadmins.Items[i].Spec.ServerGroups {
-				if selector, err := naming.AsSelector(*serverGroup.PostgresClusterSelector); err == nil {
+				if selector, err := naming.AsSelector(serverGroup.PostgresClusterSelector); err == nil {
 					if selector.Matches(labels.Set(cluster.GetLabels())) {
 						matching = append(matching, &pgadmins.Items[i])
 					}
@@ -67,7 +67,7 @@ func (r *PGAdminReconciler) getClustersForPGAdmin(
 	var selector labels.Selector
 
 	for _, serverGroup := range pgAdmin.Spec.ServerGroups {
-		if selector, err = naming.AsSelector(*serverGroup.PostgresClusterSelector); err == nil {
+		if selector, err = naming.AsSelector(serverGroup.PostgresClusterSelector); err == nil {
 			var filteredList v1beta1.PostgresClusterList
 			err = r.List(ctx, &filteredList,
 				client.InNamespace(pgAdmin.Namespace),

pkg/apis/postgres-operator.crunchydata.com/v1beta1/standalone_pgadmin_types.go

@@ -99,7 +99,8 @@ type PGAdminSpec struct {
 	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
 
 	// AdminUsername is the username to set during pgAdmin startup.
-	// pgAdmin requires this to have a valid email form.
+	// pgAdmin requires this to have a valid email form in order to log in.
+	// Once set, this cannot be changed.
 	// +optional
 	AdminUsername string `json:"adminUsername"`
 
@@ -126,7 +127,7 @@ type ServerGroup struct {
 
 	// PostgresClusterSelector selects clusters to dynamically add to pgAdmin by matching labels.
 	// An empty selector like `{}` will select ALL clusters in the namespace.
-	PostgresClusterSelector *metav1.LabelSelector `json:"postgresClusterSelector"`
+	PostgresClusterSelector metav1.LabelSelector `json:"postgresClusterSelector"`
 }
 
 // PGAdminStatus defines the observed state of PGAdmin