From b90c9c236a60dde25bb518946202434ad3be5856 Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Wed, 7 Feb 2024 13:53:46 +0100
Subject: [PATCH] apps/ninja: move kustomization variables to fix substitution

---
 apps/code-kustomization.yaml                        | 13 -------------
 apps/forge-kustomization.yaml                       | 13 -------------
 apps/kustomization.yaml                             |  4 ----
 apps/ninja/invoiceninja-kustomization.yaml          |  4 ++--
 apps/ninja/invoiceninja-secrets-kustomization.yaml  |  4 ++++
 .../invoiceninja-kustomization-variables.yaml       |  0
 .../invoiceninja-oauth-secret.yaml                  |  2 +-
 .../invoiceninja-variables.yaml                     |  2 +-
 apps/ninja/invoiceninja-secrets/kustomization.yaml  |  1 +
 9 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 apps/code-kustomization.yaml
 delete mode 100644 apps/forge-kustomization.yaml
 delete mode 100644 apps/kustomization.yaml
 rename apps/ninja/{invoiceninja => invoiceninja-secrets}/invoiceninja-kustomization-variables.yaml (100%)

diff --git a/apps/code-kustomization.yaml b/apps/code-kustomization.yaml
deleted file mode 100644
index e96ed21..0000000
--- a/apps/code-kustomization.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
-kind: Kustomization
-metadata:
-  name: stackspout-apps
-  namespace: flux-system
-spec:
-  interval: 10m
-  retryInterval: 2m
-  prune: true
-  path: ./apps/code
-  sourceRef:
-    kind: GitRepository
-    name: stackspout
diff --git a/apps/forge-kustomization.yaml b/apps/forge-kustomization.yaml
deleted file mode 100644
index 8f0cbba..0000000
--- a/apps/forge-kustomization.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
-kind: Kustomization
-metadata:
-  name: stackspout-apps
-  namespace: flux-system
-spec:
-  interval: 10m
-  retryInterval: 2m
-  prune: true
-  path: ./apps/forge
-  sourceRef:
-    kind: GitRepository
-    name: stackspout
diff --git a/apps/kustomization.yaml b/apps/kustomization.yaml
deleted file mode 100644
index f6e32ef..0000000
--- a/apps/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ninja-kustomization.yaml
diff --git a/apps/ninja/invoiceninja-kustomization.yaml b/apps/ninja/invoiceninja-kustomization.yaml
index afd3cfb..efce3f4 100644
--- a/apps/ninja/invoiceninja-kustomization.yaml
+++ b/apps/ninja/invoiceninja-kustomization.yaml
@@ -24,11 +24,11 @@ spec:
       - kind: Secret
         name: stackspin-cluster-variables
       - kind: Secret
-        name: stackspout-invoiceninja-variables
+        name: stackspin-invoiceninja-variables
       - kind: ConfigMap
         name: stackspout-invoiceninja-kustomization-variables
       - kind: Secret
-        name: stackspout-invoiceninja-oauth-variables
+        name: stackspin-invoiceninja-oauth-variables
         optional: true
       - kind: ConfigMap
         name: stackspin-single-sign-on-kustomization-variables
diff --git a/apps/ninja/invoiceninja-secrets-kustomization.yaml b/apps/ninja/invoiceninja-secrets-kustomization.yaml
index 93ba264..b9db8d3 100644
--- a/apps/ninja/invoiceninja-secrets-kustomization.yaml
+++ b/apps/ninja/invoiceninja-secrets-kustomization.yaml
@@ -16,3 +16,7 @@ spec:
   dependsOn:
     - name: flux
     - name: secrets-controller
+  postBuild:
+    substituteFrom:
+      - kind: Secret
+        name: stackspin-cluster-variables
diff --git a/apps/ninja/invoiceninja/invoiceninja-kustomization-variables.yaml b/apps/ninja/invoiceninja-secrets/invoiceninja-kustomization-variables.yaml
similarity index 100%
rename from apps/ninja/invoiceninja/invoiceninja-kustomization-variables.yaml
rename to apps/ninja/invoiceninja-secrets/invoiceninja-kustomization-variables.yaml
diff --git a/apps/ninja/invoiceninja-secrets/invoiceninja-oauth-secret.yaml b/apps/ninja/invoiceninja-secrets/invoiceninja-oauth-secret.yaml
index 354622a..02e8678 100644
--- a/apps/ninja/invoiceninja-secrets/invoiceninja-oauth-secret.yaml
+++ b/apps/ninja/invoiceninja-secrets/invoiceninja-oauth-secret.yaml
@@ -2,7 +2,7 @@
 apiVersion: secretgenerator.mittwald.de/v1alpha1
 kind: StringSecret
 metadata:
-  name: stackspout-invoiceninja-oauth-variables
+  name: stackspin-invoiceninja-oauth-variables
   namespace: flux-system
 spec:
   data:
diff --git a/apps/ninja/invoiceninja-secrets/invoiceninja-variables.yaml b/apps/ninja/invoiceninja-secrets/invoiceninja-variables.yaml
index bf5a6e1..f6ba2d0 100644
--- a/apps/ninja/invoiceninja-secrets/invoiceninja-variables.yaml
+++ b/apps/ninja/invoiceninja-secrets/invoiceninja-variables.yaml
@@ -1,7 +1,7 @@
 apiVersion: secretgenerator.mittwald.de/v1alpha1
 kind: StringSecret
 metadata:
-  name: stackspout-invoiceninja-variables
+  name: stackspin-invoiceninja-variables
   namespace: flux-system
 spec:
   fields:
diff --git a/apps/ninja/invoiceninja-secrets/kustomization.yaml b/apps/ninja/invoiceninja-secrets/kustomization.yaml
index 01e50f0..a966905 100644
--- a/apps/ninja/invoiceninja-secrets/kustomization.yaml
+++ b/apps/ninja/invoiceninja-secrets/kustomization.yaml
@@ -2,3 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - invoiceninja-variables.yaml
+  - invoiceninja-kustomization-variables.yaml