better gathering of PGAdmin resources

Treats PGAdmin resources separately since they are independent of a PostgresCluster. Gathers all PGAdmin resources in a namespace. This is usually one, but it could be several.

Author: philrhurst

internal/apis/postgres-operator.crunchydata.com/v1beta1/pgadmin_types.go

@@ -0,0 +1,39 @@
+// Copyright 2021 - 2025 Crunchy Data Solutions, Inc.
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package v1beta1
+
+import (
+	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/cli-runtime/pkg/resource"
+	"k8s.io/client-go/dynamic"
+)
+
+func NewPgadminClient(rcg resource.RESTClientGetter) (
+	*meta.RESTMapping, dynamic.NamespaceableResourceInterface, error,
+) {
+	gvk := GroupVersion.WithKind("PGAdmin")
+
+	mapper, err := rcg.ToRESTMapper()
+	if err != nil {
+		return nil, nil, err
+	}
+
+	mapping, err := mapper.RESTMapping(gvk.GroupKind(), gvk.Version)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	config, err := rcg.ToRESTConfig()
+	if err != nil {
+		return nil, nil, err
+	}
+
+	client, err := dynamic.NewForConfig(config)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return mapping, client.Resource(mapping.Resource), nil
+}

internal/cmd/export.go

@@ -624,10 +624,9 @@ Collecting PGO CLI logs...
 			writeInfo(cmd, fmt.Sprintf("Error running kubectl describe lease: %s", err))
 		}
 
-		writeInfo(cmd, "Running kubectl describe pgadmin...")
-		err = runKubectlCommand(tw, cmd, "pgadmin/describe/pgadmin", "describe", "pgadmin", "-n", namespace)
+		err = gatherPgadminResources(config, clientset, ctx, namespace, tw, cmd)
 		if err != nil {
-			writeInfo(cmd, fmt.Sprintf("Error running kubectl describe pgadmin: %s", err))
+			writeInfo(cmd, fmt.Sprintf("Error gathering PGAdmin Resources: %s", err))
 		}
 
 		// Print cli output
@@ -647,6 +646,74 @@ Collecting PGO CLI logs...
 	return cmd
 }
 
+func gatherPgadminResources(config *internal.Config,
+	clientset *kubernetes.Clientset,
+	ctx context.Context,
+	namespace string,
+	tw *tar.Writer, cmd *cobra.Command) error {
+
+	_, pgadminClient, err := v1beta1.NewPgadminClient(config)
+
+	if err != nil {
+		return err
+	}
+
+	pgadmins, err := pgadminClient.Namespace(namespace).List(ctx, metav1.ListOptions{})
+	if err != nil {
+		if apierrors.IsForbidden(err) {
+			writeInfo(cmd, err.Error())
+			return nil
+		}
+		return err
+	}
+
+	if len(pgadmins.Items) == 0 {
+		// If we didn't find any resources, skip
+		writeInfo(cmd, "Resource PGAdmin not found, skipping")
+		return nil
+	}
+
+	// Create a buffer to generate string with the table formatted list
+	var buf bytes.Buffer
+	if err := printers.NewTablePrinter(printers.PrintOptions{}).
+		PrintObj(pgadmins, &buf); err != nil {
+		return err
+	}
+
+	// Define the file name/path where the list file will be created and
+	// write to the tar
+	path := "pgadmin" + "/list"
+	if err := writeTar(tw, buf.Bytes(), path, cmd); err != nil {
+		return err
+	}
+
+	for _, obj := range pgadmins.Items {
+		b, err := yaml.Marshal(obj)
+		if err != nil {
+			return err
+		}
+
+		path := "pgadmin" + "/" + obj.GetName() + ".yaml"
+		if err := writeTar(tw, b, path, cmd); err != nil {
+			return err
+		}
+
+		writeInfo(cmd, "Collecting PGAdmin pod logs...")
+		err = gatherPodLogs(ctx, clientset, namespace, fmt.Sprintf("%s=%s", util.LabelPgadmin, obj.GetName()), "pgadmin", tw, cmd)
+		if err != nil {
+			writeInfo(cmd, fmt.Sprintf("Error gathering PGAdmin pod logs: %s", err))
+		}
+
+		writeInfo(cmd, "Running kubectl describe pgadmin")
+		err = runKubectlCommand(tw, cmd, "pgadmin/describe/"+obj.GetName(), "describe", "pgadmin", obj.GetName(), "-n", namespace)
+		if err != nil {
+			writeInfo(cmd, fmt.Sprintf("Error running kubectl describe pgadmin: %s", err))
+		}
+	}
+
+	return nil
+}
+
 func gatherPluginList(clusterName string, tw *tar.Writer, cmd *cobra.Command) error {
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancel() // Ensure the context is canceled to avoid leaks

internal/util/naming.go

@@ -13,6 +13,9 @@ const (
 	// LabelCluster is used to label PostgresCluster objects.
 	LabelCluster = labelPrefix + "cluster"
 
+	// LabelPgadmin is used to label PGAdmin objects.
+	LabelPgadmin = labelPrefix + "pgadmin"
+
 	// LabelData is used to identify Pods and Volumes store Postgres data.
 	LabelData = labelPrefix + "data"