diff --git a/hosts/unstable/genesis/net/hosts b/hosts/unstable/genesis/net/hosts index 8ad13cd..7e7c3c3 100644 --- a/hosts/unstable/genesis/net/hosts +++ b/hosts/unstable/genesis/net/hosts @@ -23,7 +23,7 @@ 10.42.4.1 matrix matrix.thehellings.lan # VIP -10.42.5.1 longhorn.cluster matrix.cluster pgadmin.cluter postgres.cluster immich.cluster +10.42.5.1 longhorn.cluster matrix.cluster postgres.cluster immich.cluster # IPMI 10.42.100.6 isaiahbmc isaiahbmc.thehellings.lan @@ -35,7 +35,7 @@ 100.70.99.91 exodus.home exodus.shire-zebra.ts.net 100.96.198.104 genesis.home genesis.shire-zebra.ts.net smart.home zwave.home nixcache.home gitcache.home dashy.home uptime.home speed.home 100.68.203.1 hosea.home hosea.shire-zebra.ts.net grafana.home -100.84.183.79 isaiah.home isaiah.shire-zebra.ts.net pgadmin.kubernetes longhorn.kubernetes +100.84.183.79 isaiah.home isaiah.shire-zebra.ts.net longhorn.kubernetes 100.102.186.39 jeremiah.home jeremiah.shire-zebra.ts.net matrix.kubernetes immich.kubernetes postgres.kubernetes buildbot.home 100.90.74.19 zeke.home zeke.shire-zebra.ts.net 100.109.86.8 linode.home linode.shire-zebra.ts.net diff --git a/manifests/databases/kustomization.yaml b/manifests/databases/kustomization.yaml index f1cea26..29bc57c 100644 --- a/manifests/databases/kustomization.yaml +++ b/manifests/databases/kustomization.yaml @@ -4,6 +4,5 @@ resources: - namespace.yaml - secrets.yaml - postgres-cluster.yaml - - postgres-pgadmin.yaml - postgres-matrix.yaml - ingress.yaml diff --git a/manifests/databases/postgres-cluster.yaml b/manifests/databases/postgres-cluster.yaml index 1713ed5..ac465a8 100644 --- a/manifests/databases/postgres-cluster.yaml +++ b/manifests/databases/postgres-cluster.yaml @@ -11,13 +11,6 @@ spec: managed: roles: - - name: pgadmin - ensure: present - comment: PG Admin user - login: true - superuser: true - passwordSecret: - name: postgres-user-pgadmin - name: matrix ensure: present comment: Matrix DB user diff --git a/manifests/databases/postgres-pgadmin.yaml b/manifests/databases/postgres-pgadmin.yaml deleted file mode 100644 index 220fbf1..0000000 --- a/manifests/databases/postgres-pgadmin.yaml +++ /dev/null @@ -1,103 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: config-pgadmin -data: - servers.json: | - { - "Servers": { - "1": { - "Name": "Postgres", - "Group": "Servers", - "Port": 5432, - "Username": "pgadmin", - "Host": "postgres-rw", - "SSLMode": "allow", - "MaintenanceDB": "postgres" - } - } - } ---- -apiVersion: v1 -kind: Service -metadata: - name: service-pgadmin -spec: - ports: - - protocol: TCP - port: 80 - targetPort: http - selector: - app: pgadmin - type: ClusterIP ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: pgadmin -spec: - serviceName: service-pgadmin - podManagementPolicy: Parallel - replicas: 1 - updateStrategy: - type: RollingUpdate - selector: - matchLabels: - app: pgadmin - template: - metadata: - labels: - app: pgadmin - spec: - terminationGracePeriodSeconds: 10 - containers: - - name: pgadmin - image: "dpage/pgadmin4:9.3" - imagePullPolicy: Always - env: - - name: PGADMIN_DEFAULT_EMAIL - value: greg@thehellings.com - - name: PGADMIN_DEFAULT_PASSWORD - valueFrom: - secretKeyRef: - name: postgres-user-pgadmin - key: password - - name: PGADMIN_SERVER_JSON_FILE - value: /config-pgadmin-vol/servers.json - ports: - - name: http - containerPort: 80 - protocol: TCP - volumeMounts: - - name: config-pgadmin-vol - mountPath: /config-pgadmin-vol/ - readOnly: true - - name: pgadmin-data - mountPath: /var/lib/pgadmin - volumes: - - name: config-pgadmin-vol - configMap: - name: config-pgadmin - volumeClaimTemplates: - - metadata: - name: pgadmin-data - spec: - accessModes: ["ReadWriteOnce"] - resources: - requests: - storage: 3Gi ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: ingress-pgadmin -spec: - ingressClassName: tailscale - defaultBackend: - service: - name: service-pgadmin - port: - number: 80 - tls: - - hosts: - - pgadmin diff --git a/manifests/databases/secrets.yaml b/manifests/databases/secrets.yaml index 0039fbc..bd7c46a 100644 --- a/manifests/databases/secrets.yaml +++ b/manifests/databases/secrets.yaml @@ -34,40 +34,6 @@ spec: --- apiVersion: external-secrets.io/v1 kind: ExternalSecret -metadata: - name: postgres-user-pgadmin - namespace: db -spec: - target: - name: postgres-user-pgadmin - deletionPolicy: Delete - template: - type: Opaque - data: - username: |- - {{ .username }} - password: |- - {{ .password }} - data: - - secretKey: username - sourceRef: - storeRef: - name: bitwarden-login - kind: ClusterSecretStore - remoteRef: - key: f333d637-1667-499d-b9a0-b2e9012bd8b7 - property: username - - secretKey: password - sourceRef: - storeRef: - name: bitwarden-login - kind: ClusterSecretStore - remoteRef: - key: f333d637-1667-499d-b9a0-b2e9012bd8b7 - property: password ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret metadata: name: k3sbackup-externalsecret namespace: db diff --git a/modules/hm/gui/bookmarks.nix b/modules/hm/gui/bookmarks.nix index 24dcd1c..f02f05c 100644 --- a/modules/hm/gui/bookmarks.nix +++ b/modules/hm/gui/bookmarks.nix @@ -253,10 +253,6 @@ name = "Longhorn"; url = "http://longhorn.shire-zebra.ts.net"; } - { - name = "PGAdmin4"; - url = "http://pgadmin.shire-zebra.ts.net/"; - } ]; } {