From b9605b0ff2487964b00a232bd834324a36a74bc6 Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Sat, 2 Mar 2024 00:19:12 +0100
Subject: [PATCH] apps: various value fixes for new apps
---
apps/flow/n8n/n8n-values-configmap.yaml | 6 +++++-
apps/forge/forgejo/forgejo-values-configmap.yaml | 2 +-
apps/meet/calcom/calcom-keys.yaml | 16 +++++++---------
.../invoiceninja-values-configmap.yaml | 2 +-
apps/support/zammad/zammad-values-configmap.yaml | 7 ++++---
5 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/apps/flow/n8n/n8n-values-configmap.yaml b/apps/flow/n8n/n8n-values-configmap.yaml
index 72847b3..b8c5299 100644
--- a/apps/flow/n8n/n8n-values-configmap.yaml
+++ b/apps/flow/n8n/n8n-values-configmap.yaml
@@ -33,9 +33,13 @@ data:
hosts:
- "${n8n_domain}"
- secret:
+ config:
database:
type: sqlite
+ host: "${n8n_domain}"
+ port: 443
+ protocol: https
+ timezone: "Europe/Berlin"
# TODO Adjust n8n Mailing config
# mailer:
diff --git a/apps/forge/forgejo/forgejo-values-configmap.yaml b/apps/forge/forgejo/forgejo-values-configmap.yaml
index 1dda603..0d99224 100644
--- a/apps/forge/forgejo/forgejo-values-configmap.yaml
+++ b/apps/forge/forgejo/forgejo-values-configmap.yaml
@@ -46,7 +46,7 @@ data:
ISSUE_INDEXER_TYPE: bleve
REPO_INDEXER_ENABLED: true
- APP_NAME: "Forge for ${company_name}"
+ APP_NAME: "Forge for ${org_name}"
repository:
DEFAULT_PUSH_CREATE_PRIVATE: false
ENABLE_PUSH_CREATE_USER: true
diff --git a/apps/meet/calcom/calcom-keys.yaml b/apps/meet/calcom/calcom-keys.yaml
index 6d35598..f82f765 100644
--- a/apps/meet/calcom/calcom-keys.yaml
+++ b/apps/meet/calcom/calcom-keys.yaml
@@ -1,12 +1,10 @@
-apiVersion: secretgenerator.mittwald.de/v1alpha1
-kind: StringSecret
+apiVersion: v1
+kind: Secret
metadata:
name: stackspin-calcom-keys
namespace: stackspout
-spec:
- data:
- DATABASE_URL: "postgresql://calcom:${postgresql_password}@calcom-postgresql/calcom"
- NEXT_PUBLIC_WEBAPP_URL: "https://${calcom_domain}"
- NEXTAUTH_SECRET: "${nextauth_secret}"
- CALENDSO_ENCRYPTION_KEY: "${calendso_key}"
- fields: []
+stringData:
+ DATABASE_URL: "postgresql://calcom:${postgresql_password}@calcom-postgresql/calcom"
+ NEXT_PUBLIC_WEBAPP_URL: "https://${calcom_domain}"
+ NEXTAUTH_SECRET: "${nextauth_secret}"
+ CALENDSO_ENCRYPTION_KEY: "${calendso_key}"
diff --git a/apps/ninja/invoiceninja/invoiceninja-values-configmap.yaml b/apps/ninja/invoiceninja/invoiceninja-values-configmap.yaml
index f911c66..2a5b9b6 100644
--- a/apps/ninja/invoiceninja/invoiceninja-values-configmap.yaml
+++ b/apps/ninja/invoiceninja/invoiceninja-values-configmap.yaml
@@ -70,7 +70,7 @@ data:
- name: MAIL_FROM_ADDRESS
value: "${outgoing_mail_from_address}"
- name: MAIL_FROM_NAME
- value: "${business_name}"
+ value: "${org_name}"
# Missing: invoiceninja OpenID Connect Single Sign-On Configuration
# - name: Stackspin
diff --git a/apps/support/zammad/zammad-values-configmap.yaml b/apps/support/zammad/zammad-values-configmap.yaml
index 4da0123..a4383b9 100644
--- a/apps/support/zammad/zammad-values-configmap.yaml
+++ b/apps/support/zammad/zammad-values-configmap.yaml
@@ -6,12 +6,13 @@ metadata:
data:
values.yaml: |
# https://github.com/zammad/zammad-helm/blob/main/zammad/values.yaml
+ # TODO https://github.com/zammad/zammad-helm/issues/259
commonLabels:
stackspin.net/backupSet: "zammad"
podLabels:
stackspin.net/backupSet: "zammad"
podAnnotations:
- backup.velero.io/backup-volumes: "data"
+ backup.velero.io/backup-volumes: "zammad-var"
ingress:
enabled: true
@@ -45,11 +46,11 @@ data:
database: "zammad"
postgresPassword: "${postgresql_postgres_password}"
password: "${postgresql_password}"
+ podAnnotations:
+ backup.velero.io/backup-volumes: "data"
primary:
persistence:
existingClaim: zammad-postgres
- podAnnotations:
- backup.velero.io/backup-volumes: "data"
minio:
auth:
--
GitLab