Pgadmin remove service

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

@@ -1398,37 +1398,6 @@ spec:
                   - postgresClusterSelector
                   type: object
                 type: array
-              service:
-                description: Specification of the service that exposes pgAdmin.
-                properties:
-                  metadata:
-                    description: Metadata contains metadata for custom resources
-                    properties:
-                      annotations:
-                        additionalProperties:
-                          type: string
-                        type: object
-                      labels:
-                        additionalProperties:
-                          type: string
-                        type: object
-                    type: object
-                  nodePort:
-                    description: The port on which this service is exposed when type
-                      is NodePort or LoadBalancer. Value must be in-range and not
-                      in use or the operation will fail. If unspecified, a port will
-                      be allocated if this Service requires one. - https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
-                    format: int32
-                    type: integer
-                  type:
-                    default: ClusterIP
-                    description: 'More info: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types'
-                    enum:
-                    - ClusterIP
-                    - NodePort
-                    - LoadBalancer
-                    type: string
-                type: object
               tolerations:
                 description: 'Tolerations of the PGAdmin pod. More info: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration'
                 items:

internal/controller/standalone_pgadmin/controller.go

@@ -129,9 +129,6 @@ func (r *PGAdminReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 	if err == nil {
 		clusters, err = r.getClustersForPGAdmin(ctx, pgAdmin)
 	}
-	if err == nil {
-		_, err = r.reconcilePGAdminService(ctx, pgAdmin)
-	}
 	if err == nil {
 		configmap, err = r.reconcilePGAdminConfigMap(ctx, pgAdmin, clusters)
 	}

internal/controller/standalone_pgadmin/statefulset.go

@@ -69,11 +69,6 @@ func statefulset(
 	// Don't clutter the namespace with extra ControllerRevisions.
 	sts.Spec.RevisionHistoryLimit = initialize.Int32(0)
 
-	// Give the Pod a stable DNS record based on its name.
-	// - https://docs.k8s.io/concepts/workloads/controllers/statefulset/#stable-network-id
-	// - https://docs.k8s.io/concepts/services-networking/dns-pod-service/#pods
-	sts.Spec.ServiceName = naming.StandalonePGAdminService(pgadmin).Name
-
 	// Set the StatefulSet update strategy to "RollingUpdate", and the Partition size for the
 	// update strategy to 0 (note that these are the defaults for a StatefulSet).  This means
 	// every pod of the StatefulSet will be deleted and recreated when the Pod template changes.

internal/naming/names.go

@@ -587,19 +587,6 @@ func StandalonePGAdmin(pgadmin *v1beta1.PGAdmin) metav1.ObjectMeta {
 	}
 }
 
-// StandalonePGAdminService returns the ObjectMeta necessary to lookup the Service
-// that is responsible for the network identity of Pods.
-func StandalonePGAdminService(pgadmin *v1beta1.PGAdmin) metav1.ObjectMeta {
-	// The hyphen below ensures that the DNS name will not be interpreted as a
-	// top-level domain. Partially qualified requests for "{pod}.{cluster}-pods"
-	// should not leave the Kubernetes cluster, and if they do they are less
-	// likely to resolve.
-	return metav1.ObjectMeta{
-		Namespace: pgadmin.Namespace,
-		Name:      pgadmin.Name + "-standalone-pods",
-	}
-}
-
 // UpgradeCheckConfigMap returns the ObjectMeta for the PGO ConfigMap
 func UpgradeCheckConfigMap() metav1.ObjectMeta {
 	return metav1.ObjectMeta{

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

@@ -89,10 +89,6 @@ type PGAdminSpec struct {
 	// +optional
 	PriorityClassName *string `json:"priorityClassName,omitempty"`
 
-	// Specification of the service that exposes pgAdmin.
-	// +optional
-	Service *ServiceSpec `json:"service,omitempty"`
-
 	// Tolerations of the PGAdmin pod.
 	// More info: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration
 	// +optional

testing/kuttl/e2e-other/standalone-pgadmin/01-assert.yaml

@@ -4,7 +4,7 @@ commands:
 - script: |
     contains() { bash -ceu '[[ "$1" == *"$2"* ]]' - "$@"; }
 
-    clusters_actual=$(kubectl exec -n "${NAMESPACE}" pgadmin-standalone-pgadmin-0 -- bash -c 'python3 /usr/local/lib/python3.11/site-packages/pgadmin4/setup.py --dump-servers /tmp/dumped.json --user admin@pgo.com && cat /tmp/dumped.json')
+    clusters_actual=$(kubectl exec -n "${NAMESPACE}" pgadmin-standalone-pgadmin-0 -- bash -c "python3 /usr/local/lib/python3.11/site-packages/pgadmin4/setup.py --dump-servers /tmp/dumped.json --user admin@pgadmin.${NAMESPACE}.svc && cat /tmp/dumped.json")
 
     clusters_expected="\"Servers\": {}"
     {

testing/kuttl/e2e-other/standalone-pgadmin/03-assert.yaml

@@ -43,7 +43,7 @@ commands:
       exit 1
     }
 
-    clusters_actual=$(kubectl exec -n "${NAMESPACE}" pgadmin-standalone-pgadmin-0 -- bash -c 'python3 /usr/local/lib/python3.11/site-packages/pgadmin4/setup.py --dump-servers /tmp/dumped.json --user admin@pgo.com && cat /tmp/dumped.json')
+    clusters_actual=$(kubectl exec -n "${NAMESPACE}" pgadmin-standalone-pgadmin-0 -- bash -c "python3 /usr/local/lib/python3.11/site-packages/pgadmin4/setup.py --dump-servers /tmp/dumped.json --user admin@pgadmin.${NAMESPACE}.svc && cat /tmp/dumped.json")
 
     clusters_expected='
     {

testing/kuttl/e2e-other/standalone-pgadmin/05-assert.yaml

@@ -55,7 +55,7 @@ commands:
       exit 1
     }
 
-    clusters_actual=$(kubectl exec -n "${NAMESPACE}" pgadmin-standalone-pgadmin-0 -- bash -c 'python3 /usr/local/lib/python3.11/site-packages/pgadmin4/setup.py --dump-servers /tmp/dumped.json --user admin@pgo.com && cat /tmp/dumped.json')
+    clusters_actual=$(kubectl exec -n "${NAMESPACE}" pgadmin-standalone-pgadmin-0 -- bash -c "python3 /usr/local/lib/python3.11/site-packages/pgadmin4/setup.py --dump-servers /tmp/dumped.json --user admin@pgadmin.${NAMESPACE}.svc && cat /tmp/dumped.json")
 
     clusters_expected='
     {

testing/kuttl/e2e-other/standalone-pgadmin/07-assert.yaml

@@ -65,7 +65,7 @@ commands:
       exit 1
     }
 
-    clusters_actual=$(kubectl exec -n "${NAMESPACE}" pgadmin-standalone-pgadmin-0 -- bash -c 'python3 /usr/local/lib/python3.11/site-packages/pgadmin4/setup.py --dump-servers /tmp/dumped.json --user admin@pgo.com && cat /tmp/dumped.json')
+    clusters_actual=$(kubectl exec -n "${NAMESPACE}" pgadmin-standalone-pgadmin-0 -- bash -c "python3 /usr/local/lib/python3.11/site-packages/pgadmin4/setup.py --dump-servers /tmp/dumped.json --user admin@pgadmin.${NAMESPACE}.svc && cat /tmp/dumped.json")
 
     clusters_expected='
     {

testing/kuttl/e2e-other/standalone-pgadmin/09-assert.yaml

@@ -55,7 +55,7 @@ commands:
       exit 1
     }
 
-    clusters_actual=$(kubectl exec -n "${NAMESPACE}" pgadmin-standalone-pgadmin-0 -- bash -c 'python3 /usr/local/lib/python3.11/site-packages/pgadmin4/setup.py --dump-servers /tmp/dumped.json --user admin@pgo.com && cat /tmp/dumped.json')
+    clusters_actual=$(kubectl exec -n "${NAMESPACE}" pgadmin-standalone-pgadmin-0 -- bash -c "python3 /usr/local/lib/python3.11/site-packages/pgadmin4/setup.py --dump-servers /tmp/dumped.json --user admin@pgadmin.${NAMESPACE}.svc && cat /tmp/dumped.json")
 
     clusters_expected='
     {

testing/kuttl/e2e-other/standalone-pgadmin/files/00-pgadmin-check.yaml

@@ -1,24 +1,4 @@
 apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    postgres-operator.crunchydata.com/role: pgadmin
-    postgres-operator.crunchydata.com/standalone-pgadmin: pgadmin
-  name: pgadmin-standalone-pods
-spec:
-  ports:
-  - name: pgadmin
-    port: 5050
-    protocol: TCP
-    targetPort: pgadmin
-  selector:
-    postgres-operator.crunchydata.com/role: standalone-pgadmin
-    postgres-operator.crunchydata.com/standalone-pgadmin: pgadmin
-  type: ClusterIP
-status:
-  loadBalancer: {}
----
-apiVersion: v1
 kind: ConfigMap
 metadata:
   labels: