From 074c93ab24dcdf4e329ea00c0953b85fe813b04a Mon Sep 17 00:00:00 2001
From: Joseph Hanson <joe@veri.dev>
Date: Mon, 1 Apr 2024 11:05:37 -0500
Subject: [PATCH] Revert.

---
 .../observability/grafana/app/externalsecret.yaml     |  4 ++--
 .../apps/observability/grafana/app/helmrelease.yaml   | 11 -----------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/kubernetes/apps/observability/grafana/app/externalsecret.yaml b/kubernetes/apps/observability/grafana/app/externalsecret.yaml
index dce3eb0..c3491d0 100644
--- a/kubernetes/apps/observability/grafana/app/externalsecret.yaml
+++ b/kubernetes/apps/observability/grafana/app/externalsecret.yaml
@@ -20,8 +20,8 @@ spec:
         GF_SERVER_ROOT_URL: https://grafana.hsn.dev
         GF_DATABASE_NAME: ${DB_NAME}
         GF_DATABASE_HOST: "grafana-primary.observability.svc:5432"
-        # GF_DATABASE_USER: "{{ .grafana_postgres_user }}"
-        # GF_DATABASE_PASSWORD: "{{ .grafana_postgres_password }}"
+        GF_DATABASE_USER: "{{ .grafana_postgres_user }}"
+        GF_DATABASE_PASSWORD: "{{ .grafana_postgres_password }}"
         GF_DATABASE_SSL_MODE: "require"
         GF_DATABASE_TYPE: postgres
         GF_ANALYTICS_CHECK_FOR_UPDATES: "false"
diff --git a/kubernetes/apps/observability/grafana/app/helmrelease.yaml b/kubernetes/apps/observability/grafana/app/helmrelease.yaml
index cf85ba1..8b5248c 100644
--- a/kubernetes/apps/observability/grafana/app/helmrelease.yaml
+++ b/kubernetes/apps/observability/grafana/app/helmrelease.yaml
@@ -31,17 +31,6 @@ spec:
   values:
     replicas: 2
     envFromSecret: grafana-secret
-    env:
-      - name: GF_DATABASE_USER
-        valueFrom:
-          secretKeyRef:
-            name: grafana-pguser-grafana
-            key: user
-      - name: GF_DATABASE_PASSWORD
-        valueFrom:
-          secretKeyRef:
-            name: grafana-pguser-grafana
-            key: password
     dashboardProviders:
       dashboardproviders.yaml:
         apiVersion: 1