diff --git a/add-ons/postgres/cluster.yaml b/add-ons/postgres/cluster.yaml index d6f9734..628ee3b 100644 --- a/add-ons/postgres/cluster.yaml +++ b/add-ons/postgres/cluster.yaml @@ -19,11 +19,6 @@ spec: name: grafana passwordSecret: name: grafana-db - - ensure: present - login: true - name: legislative - passwordSecret: - name: legislative-db - ensure: present inRoles: - pg_read_all_data diff --git a/add-ons/postgres/kustomization.yaml b/add-ons/postgres/kustomization.yaml index f6ec29c..ac0a0ea 100644 --- a/add-ons/postgres/kustomization.yaml +++ b/add-ons/postgres/kustomization.yaml @@ -6,8 +6,6 @@ resources: - authentik-database.yaml - grafana-db-sealedsecret.yaml - grafana-database.yaml - - legislative-db-sealedsecret.yaml - - legislative-database.yaml - pgweb-db-sealedsecret.yaml - redoost-db-sealedsecret.yaml - redoost-database.yaml diff --git a/add-ons/postgres/legislative-database.yaml b/add-ons/postgres/legislative-database.yaml deleted file mode 100644 index 98d4e14..0000000 --- a/add-ons/postgres/legislative-database.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: postgresql.cnpg.io/v1 -kind: Database -metadata: - name: legislative - namespace: postgres -spec: - cluster: - name: postgres - databaseReclaimPolicy: retain - name: legislative - owner: legislative diff --git a/add-ons/postgres/legislative-db-sealedsecret.yaml b/add-ons/postgres/legislative-db-sealedsecret.yaml deleted file mode 100644 index 7310dce..0000000 --- a/add-ons/postgres/legislative-db-sealedsecret.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: bitnami.com/v1alpha1 -kind: SealedSecret -metadata: - name: legislative-db - namespace: postgres -spec: - encryptedData: - password: AgCNCBWUaljY2nZSyKbBi6FLfuIvM4ZFsru3svOuQ1i3qYfHFqgtKwwGymPmQZhseSvOC7KXiS1L1CAig6bpitp8TUffxD5fY3lpv3sAAdacGAEdEC0Crhd1l8iQw0RfGxpeVgaGFCcCxEURmgXpR7F15md6eRJ5bk/nKaTTfsjXSH0RToWB1v0llK8na30A74TwnfyW5B4g5tk4WBtSoZV4hVS0Ak36y8De0aFOEIYMFqGgFpEiH4BsHtUcfClqXYHMB37IBZyeIBCu0iO+e2tYZ+qg+/Nm6yPUz09oKqMmjU0APOEIXlDoKFsa5HEmPtxvl8PMomNzXQxm194abjszI9RCcItXMvrXKSdKpgJojQMNAA22zLTF6G8KC9zk1TFvV9O0baNZ/zmxCEC9Yau3xfk5D+yxn0sEE9tEBzFtFBO7WUIyawGcCfsmq0p9NCOqWznAqZ2vmthbEd3MvS/Bzc+NyPZR9bRfHuGt7MrSAqxfLsaakES8JrSbtczntr2+dqxLUjsvWHwOlTtUAlQfONbbP5ji0QD23ZPogaeqMslu58NLBINYszeJAppv1Spr5WHHHmIHel8ffifPA7HNQ8GihVIL4dhWg1weu31phaitdA0B5EM4/j6cuukQi0JUL4jkCAu7eRPLDkL5DJY1eN0m8aQKT8LkWz9s+m1+B0My9PJxJ2G0EZTQOdGWYFuWd1FDVPHc+xW1p/ib/R0XdzcSLgfew9z9itrkipAIHQoa28vjk1iiDrS3IgK37tiqgHR/7+xzwK+MBQsT/pgI - username: AgAcVy0KKIfT60cwyaiFNFNvuDZpzdp2ygWRxyVZ/yzvXh+PIqJnlVr++EpLbkhjdL89bX0l+k1ma/x79zmONJ5WEMFRZZ0B4DEF6i+2ITfNJfvV25brGbL5LpatLyFcK6fVjkSgSHSMRwZaEerwJh2BhCqUjBBdpipP1RYTMzA0e9KvKQqgTMLvWWwjYxDBA1e/aL+RCrqPLfDgl5tEVyHLDhztU3Vpeb0UGD0BNEoWMRq662qWZpNoLihxxex7quZ4i0HsoU3E6IZ/oaYbbdsGMyHhMJh5HJf5kJVtnr0UaIc1R78EXJnfzXWTkmFBN/FDtpakqOVU16wpbMJ/zI8LtZp3UDAjwDfaRZz6w/8/0nYUEdMATdTjcNSzeitU3ZARxVJtgl9nn9P8ROVJC35itpyADQQSw+EKjNMixUAWpVkxnAP8Lp1FUGuPOLsLyCMIb684cxkxYGUavJvaiTa8hX0FKYHZJCQ9koNc7BYJxtxFiPlfmBHrfjqYu94hRFnNhSi6h4pF4oOuPk0msFT0hKP/vQP5r+h4n1yYFN6sCv6nXwAdnUkfSU2QfDd/BnR6RePQ+BGNkIAPLVaQIZSYdLeTcUrIqYSw7trdvf6VubZUEOtkUO8wCU/u3TzWlVVzpS4QhUGPJAD0DVvFpRKrw97OB/QvqaaGVcGyjE9iJDis8wlEk4ZwLiZN2mWVM0mLlLlXz+Kv49Ptxg== - template: - metadata: - labels: - cnpg.io/reload: "true" - name: legislative-db - namespace: postgres - type: kubernetes.io/basic-auth diff --git a/apps/pgweb/bookmark-legislative.yaml b/apps/pgweb/bookmark-legislative.yaml deleted file mode 100644 index e35965b..0000000 --- a/apps/pgweb/bookmark-legislative.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: pgweb-bookmark-legislative - namespace: pgweb -data: - legislative.toml: | - host = "postgres-rw.postgres.svc.cluster.local" - user = "pgweb" - passwordvar = "DATABASE_PASSWORD" - database = "legislative" - sslmode = "require" - readonly = true diff --git a/apps/pgweb/deployment.yaml b/apps/pgweb/deployment.yaml index 2248f6e..8c2c3f6 100644 --- a/apps/pgweb/deployment.yaml +++ b/apps/pgweb/deployment.yaml @@ -69,7 +69,5 @@ spec: sources: - configMap: name: pgweb-bookmark-grafana - - configMap: - name: pgweb-bookmark-legislative - configMap: name: pgweb-bookmark-redoost diff --git a/apps/pgweb/kustomization.yaml b/apps/pgweb/kustomization.yaml index e064b01..e8a3780 100644 --- a/apps/pgweb/kustomization.yaml +++ b/apps/pgweb/kustomization.yaml @@ -3,7 +3,6 @@ kind: Kustomization resources: - sealed-secret.yaml - bookmark-grafana.yaml - - bookmark-legislative.yaml - bookmark-redoost.yaml - deployment.yaml - service.yaml diff --git a/argocd-apps/apps/kustomization.yaml b/argocd-apps/apps/kustomization.yaml index 0db496e..a0b153c 100644 --- a/argocd-apps/apps/kustomization.yaml +++ b/argocd-apps/apps/kustomization.yaml @@ -6,7 +6,6 @@ resources: - garage.yaml - garage-ui.yaml - jellyfin.yaml - - legislative-summarization.yaml - pgweb.yaml - qbit.yaml - redoost.yaml diff --git a/argocd-apps/apps/legislative-summarization.yaml b/argocd-apps/apps/legislative-summarization.yaml deleted file mode 100644 index 3696daa..0000000 --- a/argocd-apps/apps/legislative-summarization.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - annotations: - argocd.argoproj.io/client-side-apply-migration-manager: argocd-controller - argocd.argoproj.io/sync-wave: "3" - name: legislative-summarization - namespace: argocd -spec: - destination: - namespace: legislative-summarization - server: https://kubernetes.default.svc - project: default - source: - path: k8s - repoURL: https://github.com/whyredfire/legislative-summarization - targetRevision: main - syncPolicy: - automated: - prune: true - selfHeal: true - syncOptions: - - CreateNamespace=true - - ServerSideApply=true