diff --git a/apps/kustomization.yaml b/apps/kustomization.yaml index 339d15e439061da1416a9d95883db187347d3730..f6e32efe82d1ab50a7ba7be26a509b44abeb7cb6 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 9e5d9e11f01d5a8605384b54065a6a30269b5ee8..6089821c07deac686d4eff220ecbd6bc2f46bd3c 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 0000000000000000000000000000000000000000..fab422e08daec2736f5d67d76ffb970cd4bc2ee2 --- /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 263fdf3df615e8c87de625a6500730c444a3f1bf..5542ae8299765b486d999b54f770fe574c959ca5 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 693fcdd9854c7550adec72cceacb886299f7f5f9..0000000000000000000000000000000000000000 --- 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