From b20bb7492bfc5153e9df3b62f290f40c2dcacca9 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Thu, 8 Jun 2023 08:00:05 -0400
Subject: [PATCH] fix: only use one secret for weave-gitops and make README
 more clear on usage

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 README.md                                                  | 2 ++
 .../apps/flux-system/weave-gitops/app/helmrelease.yaml     | 7 +------
 tmpl/kubernetes/weave-gitops-secret.sops.yaml              | 6 ++++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index f5eb4701..cff08746 100644
--- a/README.md
+++ b/README.md
@@ -198,6 +198,8 @@ In order to expose services to the internet you will need to create a [Cloudflar
    task configure
    ```
 
+⚠️ This will print out the clear-text passwords for Grafana and Weave Gitops if you had them set to `generated` in your `.config.env`. Take note of these, you'll need them to log into the applications.
+
 ### ⚡ Preparing Ubuntu Server with Ansible
 
 📍 Here we will be running an Ansible Playbook to prepare Ubuntu server for running a Kubernetes cluster.
diff --git a/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml b/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml
index 2e6f5614..4da46107 100644
--- a/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml
+++ b/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml
@@ -28,7 +28,7 @@ spec:
   values:
     adminUser:
       create: true
-      username: admin
+      createSecret: false
     ingress:
       enabled: true
       className: nginx
@@ -51,8 +51,3 @@ spec:
       impersonationResourceNames: ["admin"]
     podAnnotations:
       secret.reloader.stakater.com/reload: weave-gitops-secret
-  valuesFrom:
-    - kind: Secret
-      name: weave-gitops-secret
-      valuesKey: adminPassword
-      targetPath: adminUser.passwordHash
diff --git a/tmpl/kubernetes/weave-gitops-secret.sops.yaml b/tmpl/kubernetes/weave-gitops-secret.sops.yaml
index bb3d837f..519e95af 100644
--- a/tmpl/kubernetes/weave-gitops-secret.sops.yaml
+++ b/tmpl/kubernetes/weave-gitops-secret.sops.yaml
@@ -1,8 +1,10 @@
+---
 apiVersion: v1
 kind: Secret
 metadata:
-  name: weave-gitops-secret
+  name: cluster-user-auth
   namespace: flux-system
 type: Opaque
 stringData:
-  adminPassword: "${BOOTSTRAP_WEAVE_GITOPS_ADMIN_PASSWORD}"
+  username: admin
+  password: "${BOOTSTRAP_WEAVE_GITOPS_ADMIN_PASSWORD}"