From 63bf153c8bdc846243972492dd2ab09daffa44a5 Mon Sep 17 00:00:00 2001
From: Brad Stein <Brad.Stein@gmail.com>
Date: Sun, 14 Dec 2025 14:38:08 -0300
Subject: [PATCH] flux: add weave gitops ui

---
 NOTES.md                                       |  3 +++
 infrastructure/sources/helm/kustomization.yaml |  1 -
 infrastructure/sources/helm/weave-gitops.yaml  |  9 ---------
 services/gitops-ui/helmrelease.yaml            |  8 ++++----
 services/gitops-ui/kustomization.yaml          |  1 +
 services/gitops-ui/source.yaml                 | 11 +++++++++++
 6 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 NOTES.md
 delete mode 100644 infrastructure/sources/helm/weave-gitops.yaml
 create mode 100644 services/gitops-ui/source.yaml

diff --git a/NOTES.md b/NOTES.md
new file mode 100644
index 0000000..8b8b8d2
--- /dev/null
+++ b/NOTES.md
@@ -0,0 +1,3 @@
+# Rotation reminders (temporary secrets set by automation)
+
+- Weave GitOps UI (`cd.bstein.dev`) admin: `admin` / `G1tOps!2025` — rotate immediately after first login.
diff --git a/infrastructure/sources/helm/kustomization.yaml b/infrastructure/sources/helm/kustomization.yaml
index 7f5db9d..a0f55b0 100644
--- a/infrastructure/sources/helm/kustomization.yaml
+++ b/infrastructure/sources/helm/kustomization.yaml
@@ -8,4 +8,3 @@ resources:
   - mailu.yaml
   - prometheus.yaml
   - victoria-metrics.yaml
-  - weave-gitops.yaml
diff --git a/infrastructure/sources/helm/weave-gitops.yaml b/infrastructure/sources/helm/weave-gitops.yaml
deleted file mode 100644
index bca57fe..0000000
--- a/infrastructure/sources/helm/weave-gitops.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-# infrastructure/sources/helm/weave-gitops.yaml
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: weave-gitops
-  namespace: flux-system
-spec:
-  interval: 1h
-  url: https://charts.gitops.weave.works
diff --git a/services/gitops-ui/helmrelease.yaml b/services/gitops-ui/helmrelease.yaml
index 3e18e39..27b610d 100644
--- a/services/gitops-ui/helmrelease.yaml
+++ b/services/gitops-ui/helmrelease.yaml
@@ -8,12 +8,12 @@ spec:
   interval: 30m
   chart:
     spec:
-      chart: weave-gitops
-      version: 4.0.36
+      chart: ./charts/gitops-server
       sourceRef:
-        kind: HelmRepository
-        name: weave-gitops
+        kind: GitRepository
+        name: weave-gitops-upstream
         namespace: flux-system
+      # track upstream tag; see source object for version pin
   install:
     remediation:
       retries: 3
diff --git a/services/gitops-ui/kustomization.yaml b/services/gitops-ui/kustomization.yaml
index b5d985d..53a903e 100644
--- a/services/gitops-ui/kustomization.yaml
+++ b/services/gitops-ui/kustomization.yaml
@@ -3,4 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: flux-system
 resources:
+  - source.yaml
   - helmrelease.yaml
diff --git a/services/gitops-ui/source.yaml b/services/gitops-ui/source.yaml
new file mode 100644
index 0000000..0e87524
--- /dev/null
+++ b/services/gitops-ui/source.yaml
@@ -0,0 +1,11 @@
+# services/gitops-ui/source.yaml
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: GitRepository
+metadata:
+  name: weave-gitops-upstream
+  namespace: flux-system
+spec:
+  interval: 1h
+  url: https://github.com/weaveworks/weave-gitops.git
+  ref:
+    tag: v0.38.0