From 8a257b07af4d24d9ce02b41ce3acd578cec684c1 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Fri, 16 Dec 2022 17:02:50 -0500
Subject: [PATCH] feat: Move webhooks to add-ons directory

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .../config/crds/kube-prometheus-stack.yaml    | 30 -------------------
 cluster/flux/config/crds/kustomization.yaml   |  6 ----
 cluster/flux/config/kustomization.yaml        |  1 -
 configure                                     | 12 ++++----
 4 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 cluster/flux/config/crds/kube-prometheus-stack.yaml
 delete mode 100644 cluster/flux/config/crds/kustomization.yaml

diff --git a/cluster/flux/config/crds/kube-prometheus-stack.yaml b/cluster/flux/config/crds/kube-prometheus-stack.yaml
deleted file mode 100644
index 8891d3e7..00000000
--- a/cluster/flux/config/crds/kube-prometheus-stack.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1beta2
-kind: GitRepository
-metadata:
-  name: kube-prometheus-stack
-  namespace: flux-system
-spec:
-  interval: 12h
-  url: https://github.com/prometheus-community/helm-charts.git
-  ref:
-    # renovate: registryUrl=https://prometheus-community.github.io/helm-charts chart=kube-prometheus-stack
-    tag: kube-prometheus-stack-42.1.0
-  ignore: |
-    # exclude all
-    /*
-    # include crd directory
-    !/charts/kube-prometheus-stack/crds
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
-kind: Kustomization
-metadata:
-  name: kube-prometheus-stack-crds
-  namespace: flux-system
-spec:
-  interval: 30m
-  prune: false
-  wait: true
-  sourceRef:
-    kind: GitRepository
-    name: kube-prometheus-stack
diff --git a/cluster/flux/config/crds/kustomization.yaml b/cluster/flux/config/crds/kustomization.yaml
deleted file mode 100644
index 84caa76d..00000000
--- a/cluster/flux/config/crds/kustomization.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: flux-system
-resources:
-  - ./kube-prometheus-stack.yaml
diff --git a/cluster/flux/config/kustomization.yaml b/cluster/flux/config/kustomization.yaml
index ca09709e..227abac2 100644
--- a/cluster/flux/config/kustomization.yaml
+++ b/cluster/flux/config/kustomization.yaml
@@ -4,4 +4,3 @@ kind: Kustomization
 resources:
   - ./flux-installation.yaml
   - ./flux-cluster.yaml
-  - ./crds
diff --git a/configure b/configure
index 81b1dc14..534fd3ba 100755
--- a/configure
+++ b/configure
@@ -299,16 +299,14 @@ setup_github_webhook() {
         export BOOTSTRAP_FLUX_GITHUB_WEBHOOK_SECRET="${WEBHOOK_SECRET}"
         _log "INFO" "Using GitHub Token '${WEBHOOK_SECRET}' for Flux"
 
-        cp -rf  "${PROJECT_DIR}/tmpl/cluster/flux/webhooks" "${PROJECT_DIR}/cluster/flux/config"
+        mkdir -p "${PROJECT_DIR}/cluster/flux/add-ons"
+        cp -rf  "${PROJECT_DIR}/tmpl/cluster/flux/webhooks" "${PROJECT_DIR}/cluster/flux/add-ons"
+        cp -rf  "${PROJECT_DIR}/tmpl/cluster/flux/kustomization.yaml" "${PROJECT_DIR}/cluster/flux/add-ons"
 
         envsubst < "${PROJECT_DIR}/tmpl/cluster/flux/webhooks/github/secret.sops.yaml" \
-            > "${PROJECT_DIR}/cluster/flux/config/webhooks/github/secret.sops.yaml"
+            > "${PROJECT_DIR}/cluster/flux/add-ons/webhooks/github/secret.sops.yaml"
 
-        sops --encrypt --in-place "${PROJECT_DIR}/cluster/flux/config/webhooks/github/secret.sops.yaml"
-
-        if [[ $(yq eval --no-doc 'contains({"resources": ["./webhooks"]})' "${PROJECT_DIR}/cluster/flux/config/kustomization.yaml") == false ]]; then
-            yq --inplace '.resources += [ "./webhooks" ]' "${PROJECT_DIR}/cluster/flux/config/kustomization.yaml"
-        fi
+        sops --encrypt --in-place "${PROJECT_DIR}/cluster/flux/add-ons/webhooks/github/secret.sops.yaml"
     fi
 }