From db36c69aecb0573e1cef80a117d0b9aeb5ea1b36 Mon Sep 17 00:00:00 2001
From: Ben Blattberg <ben.blattberg@crunchydata.com>
Date: Tue, 17 Oct 2023 12:23:27 -0500
Subject: [PATCH] update service name

---
 internal/controller/standalone_pgadmin/service.go               | 2 +-
 .../e2e-other/standalone-pgadmin/files/00-pgadmin-check.yaml    | 2 +-
 .../kuttl/e2e-other/standalone-pgadmin/files/00-pgadmin.yaml    | 1 -
 .../kuttl/e2e-other/standalone-pgadmin/files/06-pgadmin.yaml    | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/internal/controller/standalone_pgadmin/service.go b/internal/controller/standalone_pgadmin/service.go
index b3da12459f..2edd13fd75 100644
--- a/internal/controller/standalone_pgadmin/service.go
+++ b/internal/controller/standalone_pgadmin/service.go
@@ -67,7 +67,7 @@ func (r *PGAdminReconciler) reconcilePGAdminService(
 func service(
 	pgadmin *v1beta1.PGAdmin) (*corev1.Service, error,
 ) {
-	service := &corev1.Service{ObjectMeta: naming.StandalonePGAdmin(pgadmin)}
+	service := &corev1.Service{ObjectMeta: naming.StandalonePGAdminService(pgadmin)}
 	service.SetGroupVersionKind(corev1.SchemeGroupVersion.WithKind("Service"))
 
 	service.Annotations = pgadmin.Spec.Metadata.GetAnnotationsOrNil()
diff --git a/testing/kuttl/e2e-other/standalone-pgadmin/files/00-pgadmin-check.yaml b/testing/kuttl/e2e-other/standalone-pgadmin/files/00-pgadmin-check.yaml
index 0f4392d9a6..bc1302aed1 100644
--- a/testing/kuttl/e2e-other/standalone-pgadmin/files/00-pgadmin-check.yaml
+++ b/testing/kuttl/e2e-other/standalone-pgadmin/files/00-pgadmin-check.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     postgres-operator.crunchydata.com/role: pgadmin
     postgres-operator.crunchydata.com/standalone-pgadmin: pgadmin
-  name: pgadmin-standalone-pgadmin
+  name: pgadmin-standalone-pods
 spec:
   ports:
   - name: pgadmin
diff --git a/testing/kuttl/e2e-other/standalone-pgadmin/files/00-pgadmin.yaml b/testing/kuttl/e2e-other/standalone-pgadmin/files/00-pgadmin.yaml
index 5f996f1aec..692c0cd06d 100644
--- a/testing/kuttl/e2e-other/standalone-pgadmin/files/00-pgadmin.yaml
+++ b/testing/kuttl/e2e-other/standalone-pgadmin/files/00-pgadmin.yaml
@@ -3,7 +3,6 @@ kind: PGAdmin
 metadata:
   name: pgadmin
 spec:
-  adminUsername: admin@pgo.com
   dataVolumeClaimSpec:
     accessModes:
     - "ReadWriteOnce"
diff --git a/testing/kuttl/e2e-other/standalone-pgadmin/files/06-pgadmin.yaml b/testing/kuttl/e2e-other/standalone-pgadmin/files/06-pgadmin.yaml
index a88a81634f..5951c16270 100644
--- a/testing/kuttl/e2e-other/standalone-pgadmin/files/06-pgadmin.yaml
+++ b/testing/kuttl/e2e-other/standalone-pgadmin/files/06-pgadmin.yaml
@@ -3,7 +3,6 @@ kind: PGAdmin
 metadata:
   name: pgadmin
 spec:
-  adminUsername: admin@pgo.com
   dataVolumeClaimSpec:
     accessModes:
     - "ReadWriteOnce"