From 2971d68c5924141d6362cfcb57e8880767409e91 Mon Sep 17 00:00:00 2001
From: Ronald Philipsen <Mail@rphilipsen.nl>
Date: Sat, 1 Feb 2025 14:51:42 +0100
Subject: [PATCH 1/2] enable kube-prometheus stack

---
 .../{ => app}/alertmanagerconfig.yaml         |  0
 .../{ => app}/externalsecret.yaml             |  0
 .../{ => app}/helmrelease.yaml                |  0
 .../{ => app}/kustomization.yaml              |  0
 .../kube-prometheus-stack/ks.yaml             | 21 +++++++++++++++++++
 .../apps/observability/kustomization.yaml     |  1 +
 6 files changed, 22 insertions(+)
 rename kubernetes/apps/observability/kube-prometheus-stack/{ => app}/alertmanagerconfig.yaml (100%)
 rename kubernetes/apps/observability/kube-prometheus-stack/{ => app}/externalsecret.yaml (100%)
 rename kubernetes/apps/observability/kube-prometheus-stack/{ => app}/helmrelease.yaml (100%)
 rename kubernetes/apps/observability/kube-prometheus-stack/{ => app}/kustomization.yaml (100%)
 create mode 100644 kubernetes/apps/observability/kube-prometheus-stack/ks.yaml

diff --git a/kubernetes/apps/observability/kube-prometheus-stack/alertmanagerconfig.yaml b/kubernetes/apps/observability/kube-prometheus-stack/app/alertmanagerconfig.yaml
similarity index 100%
rename from kubernetes/apps/observability/kube-prometheus-stack/alertmanagerconfig.yaml
rename to kubernetes/apps/observability/kube-prometheus-stack/app/alertmanagerconfig.yaml
diff --git a/kubernetes/apps/observability/kube-prometheus-stack/externalsecret.yaml b/kubernetes/apps/observability/kube-prometheus-stack/app/externalsecret.yaml
similarity index 100%
rename from kubernetes/apps/observability/kube-prometheus-stack/externalsecret.yaml
rename to kubernetes/apps/observability/kube-prometheus-stack/app/externalsecret.yaml
diff --git a/kubernetes/apps/observability/kube-prometheus-stack/helmrelease.yaml b/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml
similarity index 100%
rename from kubernetes/apps/observability/kube-prometheus-stack/helmrelease.yaml
rename to kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml
diff --git a/kubernetes/apps/observability/kube-prometheus-stack/kustomization.yaml b/kubernetes/apps/observability/kube-prometheus-stack/app/kustomization.yaml
similarity index 100%
rename from kubernetes/apps/observability/kube-prometheus-stack/kustomization.yaml
rename to kubernetes/apps/observability/kube-prometheus-stack/app/kustomization.yaml
diff --git a/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml b/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml
new file mode 100644
index 00000000..4bd3a25a
--- /dev/null
+++ b/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml
@@ -0,0 +1,21 @@
+---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: &appname kube-prometheus-stack
+  namespace: &namespace observability
+spec:
+  targetNamespace: *namespace
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *appname
+  interval: 30m
+  timeout: 5m
+  path: "./kubernetes/apps/observability/kube-prometheus-stack/app"
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+    namespace: flux-system
+  wait: false
diff --git a/kubernetes/apps/observability/kustomization.yaml b/kubernetes/apps/observability/kustomization.yaml
index 14a6d349..f1d1a78d 100644
--- a/kubernetes/apps/observability/kustomization.yaml
+++ b/kubernetes/apps/observability/kustomization.yaml
@@ -4,6 +4,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./grafana/ks.yaml
+  - ./kube-prometheus-stack/ks.yaml
   - ./prometheus-operator-crds/ks.yaml
 components:
   - ../../components/namespace

From 605357719161a1fc51a33e8ea9eb8d7b9b7d665d Mon Sep 17 00:00:00 2001
From: Ronald Philipsen <Mail@rphilipsen.nl>
Date: Sat, 1 Feb 2025 14:55:33 +0100
Subject: [PATCH 2/2] fix ks.yaml

---
 kubernetes/apps/observability/kube-prometheus-stack/ks.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml b/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml
index 4bd3a25a..02f2a082 100644
--- a/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml
+++ b/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml
@@ -4,12 +4,13 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: &appname kube-prometheus-stack
-  namespace: &namespace observability
+  namespace: flux-system
 spec:
-  targetNamespace: *namespace
   commonMetadata:
     labels:
       app.kubernetes.io/name: *appname
+  dependsOn:
+    - name: onepassword-connect
   interval: 30m
   timeout: 5m
   path: "./kubernetes/apps/observability/kube-prometheus-stack/app"
@@ -18,4 +19,5 @@ spec:
     kind: GitRepository
     name: flux-system
     namespace: flux-system
+  targetNamespace: observability
   wait: false