From 956ff9fc47b854012acc64d93c4c2dee2812eef9 Mon Sep 17 00:00:00 2001
From: Edward Cheng <edward@cheng.sydney>
Date: Tue, 18 Jun 2024 11:16:04 +1000
Subject: [PATCH 1/2] fix weave-gitops app

---
 kubernetes/apps/weave-gitops/app/ingress.yaml | 31 +++++++++++
 kubernetes/apps/weave-gitops/app/release.yaml | 41 ++++++++++++++
 .../apps/weave-gitops/weave-gitops.yaml       | 53 +++++--------------
 .../namespaces/weave-gitops.yaml              |  4 ++
 4 files changed, 90 insertions(+), 39 deletions(-)
 create mode 100644 kubernetes/apps/weave-gitops/app/ingress.yaml
 create mode 100644 kubernetes/apps/weave-gitops/app/release.yaml
 create mode 100644 kubernetes/infrastructure/namespaces/weave-gitops.yaml

diff --git a/kubernetes/apps/weave-gitops/app/ingress.yaml b/kubernetes/apps/weave-gitops/app/ingress.yaml
new file mode 100644
index 0000000..9a5efe7
--- /dev/null
+++ b/kubernetes/apps/weave-gitops/app/ingress.yaml
@@ -0,0 +1,31 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: weave-gitops-ingress
+  namespace: weave-gitops
+  annotations:
+    nginx.ingress.kubernetes.io/ssl-redirect: "false"
+    nginx.ingress.kubernetes.io/use-regex: "true"
+spec:
+  ingressClassName: nginx
+  rules:
+    - host: "weave-gitops.edward.sydney"
+      http:
+        paths:
+          - pathType: Prefix
+            path: "/"
+            backend:
+              service:
+                name: weave-gitops
+                port:
+                  number: 9001
+    - host: "weave-gitops.cluster.local"
+      http:
+        paths:
+          - pathType: Prefix
+            path: "/"
+            backend:
+              service:
+                name: weave-gitops
+                port:
+                  number: 9001
diff --git a/kubernetes/apps/weave-gitops/app/release.yaml b/kubernetes/apps/weave-gitops/app/release.yaml
new file mode 100644
index 0000000..6a24ed7
--- /dev/null
+++ b/kubernetes/apps/weave-gitops/app/release.yaml
@@ -0,0 +1,41 @@
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+  annotations:
+    metadata.weave.works/description: This is the source location for the Weave GitOps
+      Dashboard's helm chart.
+  labels:
+    app.kubernetes.io/component: ui
+    app.kubernetes.io/created-by: weave-gitops-cli
+    app.kubernetes.io/name: weave-gitops-dashboard
+    app.kubernetes.io/part-of: weave-gitops
+  name: ww-gitops
+  namespace: flux-system
+spec:
+  interval: 1h0m0s
+  type: oci
+  url: oci://ghcr.io/weaveworks/charts
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  annotations:
+    metadata.weave.works/description: This is the Weave GitOps Dashboard.  It provides
+      a simple way to get insights into your GitOps workloads.
+  name: ww-gitops
+  namespace: flux-system
+spec:
+  chart:
+    spec:
+      chart: weave-gitops
+      sourceRef:
+        kind: HelmRepository
+        name: ww-gitops
+  interval: 1h0m0s
+  values:
+    adminUser:
+      create: true
+      passwordHash: $2a$10$gnPEHsFzIJXg/eron5LiQ.teGZkKETxuA2WAyKSbxHvxpkzWJvbDe
+      username: admin
+
diff --git a/kubernetes/apps/weave-gitops/weave-gitops.yaml b/kubernetes/apps/weave-gitops/weave-gitops.yaml
index 6a24ed7..41d0af4 100644
--- a/kubernetes/apps/weave-gitops/weave-gitops.yaml
+++ b/kubernetes/apps/weave-gitops/weave-gitops.yaml
@@ -1,41 +1,16 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1beta2
-kind: HelmRepository
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
 metadata:
-  annotations:
-    metadata.weave.works/description: This is the source location for the Weave GitOps
-      Dashboard's helm chart.
-  labels:
-    app.kubernetes.io/component: ui
-    app.kubernetes.io/created-by: weave-gitops-cli
-    app.kubernetes.io/name: weave-gitops-dashboard
-    app.kubernetes.io/part-of: weave-gitops
-  name: ww-gitops
-  namespace: flux-system
+  name: weave-gitops
+  namespace: weave-gitops
 spec:
-  interval: 1h0m0s
-  type: oci
-  url: oci://ghcr.io/weaveworks/charts
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
-  annotations:
-    metadata.weave.works/description: This is the Weave GitOps Dashboard.  It provides
-      a simple way to get insights into your GitOps workloads.
-  name: ww-gitops
-  namespace: flux-system
-spec:
-  chart:
-    spec:
-      chart: weave-gitops
-      sourceRef:
-        kind: HelmRepository
-        name: ww-gitops
-  interval: 1h0m0s
-  values:
-    adminUser:
-      create: true
-      passwordHash: $2a$10$gnPEHsFzIJXg/eron5LiQ.teGZkKETxuA2WAyKSbxHvxpkzWJvbDe
-      username: admin
-
+  interval: 10m
+  timeout: 1m30s
+  retryInterval: 30s
+  targetNamespace: flux-system
+  path: ./kubernetes/apps/weave-gitops/app
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    namespace: flux-system
+    name: flux-system
\ No newline at end of file
diff --git a/kubernetes/infrastructure/namespaces/weave-gitops.yaml b/kubernetes/infrastructure/namespaces/weave-gitops.yaml
new file mode 100644
index 0000000..4319604
--- /dev/null
+++ b/kubernetes/infrastructure/namespaces/weave-gitops.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: weave-gitops

From 57102754536d76d00383f8e1337f83e1f2baefcd Mon Sep 17 00:00:00 2001
From: Edward Cheng <edward@cheng.sydney>
Date: Tue, 18 Jun 2024 11:17:03 +1000
Subject: [PATCH 2/2] fix weave-gitops app

---
 kubernetes/infrastructure/kustomization.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kubernetes/infrastructure/kustomization.yaml b/kubernetes/infrastructure/kustomization.yaml
index 40d9d9e..db708fd 100644
--- a/kubernetes/infrastructure/kustomization.yaml
+++ b/kubernetes/infrastructure/kustomization.yaml
@@ -8,6 +8,7 @@ resources:
   - ./namespaces/ingress-nginx.yaml
   - ./namespaces/podinfo.yaml
   - ./namespaces/prometheus-operator.yaml
+  - ./namespaces/weave-gitops.yaml
   - ./repositories/repositories.yaml
 #  - ./cilium/cilium.yaml
   - ./ingress-nginx/ingress-nginx-config.yaml