From 247477ce4c3a573f5bed3c02c65877f7616836cf Mon Sep 17 00:00:00 2001
From: Ronald Philipsen <Mail@rphilipsen.nl>
Date: Sat, 1 Feb 2025 15:07:37 +0100
Subject: [PATCH] move crds

---
 .../kube-prometheus-stack/ks.yaml             | 21 +++++++++++++++++
 .../apps/observability/kustomization.yaml     |  1 -
 .../app/helmrelease.yaml                      | 23 -------------------
 .../app/kustomization.yaml                    |  6 -----
 .../prometheus-operator-crds/ks.yaml          | 20 ----------------
 5 files changed, 21 insertions(+), 50 deletions(-)
 delete mode 100644 kubernetes/apps/observability/prometheus-operator-crds/app/helmrelease.yaml
 delete mode 100644 kubernetes/apps/observability/prometheus-operator-crds/app/kustomization.yaml
 delete mode 100644 kubernetes/apps/observability/prometheus-operator-crds/ks.yaml

diff --git a/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml b/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml
index 02f2a082..071397a9 100644
--- a/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml
+++ b/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml
@@ -21,3 +21,24 @@ spec:
     namespace: flux-system
   targetNamespace: observability
   wait: false
+---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: &app kube-prometheus-stack-crds
+  namespace: &namespace observability
+spec:
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
+  interval: 30m
+  path: ./kubernetes/apps/observability/kube-prometheus-stack/crds
+  prune: false
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+    namespace: flux-system
+  targetNamespace: *namespace
+  timeout: 5m
+  wait: false
diff --git a/kubernetes/apps/observability/kustomization.yaml b/kubernetes/apps/observability/kustomization.yaml
index f1d1a78d..69e5d1c2 100644
--- a/kubernetes/apps/observability/kustomization.yaml
+++ b/kubernetes/apps/observability/kustomization.yaml
@@ -5,7 +5,6 @@ kind: Kustomization
 resources:
   - ./grafana/ks.yaml
   - ./kube-prometheus-stack/ks.yaml
-  - ./prometheus-operator-crds/ks.yaml
 components:
   - ../../components/namespace
 patches:
diff --git a/kubernetes/apps/observability/prometheus-operator-crds/app/helmrelease.yaml b/kubernetes/apps/observability/prometheus-operator-crds/app/helmrelease.yaml
deleted file mode 100644
index 68a7cef0..00000000
--- a/kubernetes/apps/observability/prometheus-operator-crds/app/helmrelease.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2.json
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: prometheus-operator-crds
-spec:
-  interval: 30m
-  chart:
-    spec:
-      chart: prometheus-operator-crds
-      version: 17.0.2
-      sourceRef:
-        kind: HelmRepository
-        name: prometheus-community
-        namespace: flux-system
-  install:
-    remediation:
-      retries: 3
-  upgrade:
-    cleanupOnFail: true
-    remediation:
-      retries: 3
diff --git a/kubernetes/apps/observability/prometheus-operator-crds/app/kustomization.yaml b/kubernetes/apps/observability/prometheus-operator-crds/app/kustomization.yaml
deleted file mode 100644
index 17cbc72b..00000000
--- a/kubernetes/apps/observability/prometheus-operator-crds/app/kustomization.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-# yaml-language-server: $schema=https://json.schemastore.org/kustomization
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ./helmrelease.yaml
diff --git a/kubernetes/apps/observability/prometheus-operator-crds/ks.yaml b/kubernetes/apps/observability/prometheus-operator-crds/ks.yaml
deleted file mode 100644
index 7835b335..00000000
--- a/kubernetes/apps/observability/prometheus-operator-crds/ks.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-# 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: &app prometheus-operator-crds
-  namespace: flux-system
-spec:
-  targetNamespace: observability
-  commonMetadata:
-    labels:
-      app.kubernetes.io/name: *app
-  path: ./kubernetes/apps/observability/prometheus-operator-crds/app
-  prune: false # never should be deleted
-  sourceRef:
-    kind: GitRepository
-    name: flux-system
-  wait: false
-  interval: 30m
-  timeout: 5m