From 2a9ab28efeb3955fced979ef3c2591c7bc64f106 Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Tue, 6 Feb 2024 21:21:20 +0100
Subject: [PATCH] apps/ninja: solo it out
---
apps/kustomization.yaml | 2 --
apps/ninja/invoiceninja-kustomization.yaml | 1 -
.../invoiceninja-kustomization-variables.yaml | 7 +++++++
.../invoiceninja/invoiceninja-values-configmap.yaml | 4 ++--
apps/ninja/ninja-kustomization.yaml | 13 -------------
5 files changed, 9 insertions(+), 18 deletions(-)
create mode 100644 apps/ninja/invoiceninja/invoiceninja-kustomization-variables.yaml
delete mode 100644 apps/ninja/ninja-kustomization.yaml
diff --git a/apps/kustomization.yaml b/apps/kustomization.yaml
index 339d15e..f6e32ef 100644
--- a/apps/kustomization.yaml
+++ b/apps/kustomization.yaml
@@ -1,6 +1,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- - code-kustomization.yaml
- - forge-kustomization.yaml
- ninja-kustomization.yaml
diff --git a/apps/ninja/invoiceninja-kustomization.yaml b/apps/ninja/invoiceninja-kustomization.yaml
index 9e5d9e1..6089821 100644
--- a/apps/ninja/invoiceninja-kustomization.yaml
+++ b/apps/ninja/invoiceninja-kustomization.yaml
@@ -1,4 +1,3 @@
----
apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
kind: Kustomization
metadata:
diff --git a/apps/ninja/invoiceninja/invoiceninja-kustomization-variables.yaml b/apps/ninja/invoiceninja/invoiceninja-kustomization-variables.yaml
new file mode 100644
index 0000000..fab422e
--- /dev/null
+++ b/apps/ninja/invoiceninja/invoiceninja-kustomization-variables.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: stackspout-invoiceninja-kustomization-variables
+ namespace: flux-system
+data:
+ invoiceninja_domain: ninja.${domain}
diff --git a/apps/ninja/invoiceninja/invoiceninja-values-configmap.yaml b/apps/ninja/invoiceninja/invoiceninja-values-configmap.yaml
index 263fdf3..5542ae8 100644
--- a/apps/ninja/invoiceninja/invoiceninja-values-configmap.yaml
+++ b/apps/ninja/invoiceninja/invoiceninja-values-configmap.yaml
@@ -12,7 +12,7 @@ data:
pullPolicy: Always
ingress:
enabled: true
- hostname: "ninja.${domain}"
+ hostname: "${invoiceninja_domain}"
tls: true
certManager: true
annotations:
@@ -44,7 +44,7 @@ data:
password: "${redis_password}"
appKey: "${app_key}"
- appURL: "https://ninja.${domain}"
+ appURL: "https://${invoiceninja_domain}"
userEmail: "${admin_email}"
userPassword: "${password}"
mailer: "smtp" # FIXME use "${outgoing_mail_enabled}"
diff --git a/apps/ninja/ninja-kustomization.yaml b/apps/ninja/ninja-kustomization.yaml
deleted file mode 100644
index 693fcdd..0000000
--- a/apps/ninja/ninja-kustomization.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
-kind: Kustomization
-metadata:
- name: add-ninja
- namespace: flux-system
-spec:
- interval: 10m
- prune: true
- path: ./apps/ninja
- sourceRef:
- kind: GitRepository
- name: stackspout
--
GitLab