From 6a1adeb8dd28027e2c81f688a00866ff5c7949fe Mon Sep 17 00:00:00 2001 From: dena Date: Mon, 21 Jul 2025 13:43:30 +0200 Subject: [PATCH 1/3] add dsa complaint form conf values to envs --- k8s/helmfile/env/local/api.values.yaml.gotmpl | 6 +++++- k8s/helmfile/env/production/api.values.yaml.gotmpl | 4 ++++ k8s/helmfile/env/staging/api.values.yaml.gotmpl | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/k8s/helmfile/env/local/api.values.yaml.gotmpl b/k8s/helmfile/env/local/api.values.yaml.gotmpl index 2099ca919..5c2ec615a 100644 --- a/k8s/helmfile/env/local/api.values.yaml.gotmpl +++ b/k8s/helmfile/env/local/api.values.yaml.gotmpl @@ -16,7 +16,11 @@ wbstack: contact: mail: recipient: someone@wikimedia.de - sender: contact-@wikibase.cloud + sender: contact-@wbaas.dev + complaint: + mail: + recipient: someone@wikimedia.de + sender: dsa@wbaas.dev app: name: WBaaS Localhost diff --git a/k8s/helmfile/env/production/api.values.yaml.gotmpl b/k8s/helmfile/env/production/api.values.yaml.gotmpl index bc21ee5c3..772c46b58 100644 --- a/k8s/helmfile/env/production/api.values.yaml.gotmpl +++ b/k8s/helmfile/env/production/api.values.yaml.gotmpl @@ -72,6 +72,10 @@ wbstack: mail: recipient: contact.wikibase@wikimedia.de sender: contact-@wikibase.cloud + complaint: + mail: + recipient: dsa-meldung@wikimedia.de + sender: dsa@wikibase.cloud app: name: WBaaS Wikibase Production diff --git a/k8s/helmfile/env/staging/api.values.yaml.gotmpl b/k8s/helmfile/env/staging/api.values.yaml.gotmpl index 344a0daee..1f6bd9193 100644 --- a/k8s/helmfile/env/staging/api.values.yaml.gotmpl +++ b/k8s/helmfile/env/staging/api.values.yaml.gotmpl @@ -26,6 +26,10 @@ wbstack: mail: recipient: contact.wikibase@wikimedia.de sender: contact-@wikibase.dev + complaint: + mail: + recipient: wikibase-cloud@wikimedia.de + sender: dsa@wikibase.dev app: name: WBaaS Wikibase Dev From 617757df37682662049959727de76189d88639a2 Mon Sep 17 00:00:00 2001 From: dena Date: Mon, 21 Jul 2025 13:44:44 +0200 Subject: [PATCH 2/3] prepare api chart 0.33.0 conf --- k8s/argocd/local/api.values.yaml | 6 +++++- k8s/argocd/production/api.values.yaml | 4 ++++ k8s/argocd/staging/api.values.yaml | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/k8s/argocd/local/api.values.yaml b/k8s/argocd/local/api.values.yaml index 86e1839ce..0b7ac9039 100644 --- a/k8s/argocd/local/api.values.yaml +++ b/k8s/argocd/local/api.values.yaml @@ -145,10 +145,14 @@ trustedProxy: - '*' useProbes: true wbstack: + complaint: + mail: + recipient: someone@wikimedia.de + sender: dsa@wbaas.dev contact: mail: recipient: someone@wikimedia.de - sender: contact-@wikibase.cloud + sender: contact-@wbaas.dev elasticSearch: enabledByDefault: true maxWikisPerUser: null diff --git a/k8s/argocd/production/api.values.yaml b/k8s/argocd/production/api.values.yaml index 78c86e934..29d47073a 100644 --- a/k8s/argocd/production/api.values.yaml +++ b/k8s/argocd/production/api.values.yaml @@ -139,6 +139,10 @@ trustedProxy: - 10.108.0.0/14 useProbes: true wbstack: + complaint: + mail: + recipient: dsa-meldung@wikimedia.de + sender: dsa@wikibase.cloud contact: mail: recipient: contact.wikibase@wikimedia.de diff --git a/k8s/argocd/staging/api.values.yaml b/k8s/argocd/staging/api.values.yaml index 1acc0e3b5..ac4d6bca3 100644 --- a/k8s/argocd/staging/api.values.yaml +++ b/k8s/argocd/staging/api.values.yaml @@ -140,6 +140,10 @@ trustedProxy: - 10.112.0.0/14 useProbes: true wbstack: + complaint: + mail: + recipient: wikibase-cloud@wikimedia.de + sender: dsa@wikibase.dev contact: mail: recipient: contact.wikibase@wikimedia.de From f3943c3dc250fc0e0e4212d406e74a354a08d77f Mon Sep 17 00:00:00 2001 From: dena Date: Mon, 21 Jul 2025 13:45:03 +0200 Subject: [PATCH 3/3] use api chart 0.33.0 on local/staging --- k8s/argocd/local/app-of-apps.values.yaml | 2 +- k8s/argocd/staging/app-of-apps.values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/k8s/argocd/local/app-of-apps.values.yaml b/k8s/argocd/local/app-of-apps.values.yaml index eef833be5..11f69986e 100644 --- a/k8s/argocd/local/app-of-apps.values.yaml +++ b/k8s/argocd/local/app-of-apps.values.yaml @@ -1,5 +1,5 @@ chartVersions: wbaasUi: 0.4.0 - wbaasApi: 0.32.1 + wbaasApi: 0.33.0 redis: 17.3.8 redis2: 19.6.4 diff --git a/k8s/argocd/staging/app-of-apps.values.yaml b/k8s/argocd/staging/app-of-apps.values.yaml index eef833be5..11f69986e 100644 --- a/k8s/argocd/staging/app-of-apps.values.yaml +++ b/k8s/argocd/staging/app-of-apps.values.yaml @@ -1,5 +1,5 @@ chartVersions: wbaasUi: 0.4.0 - wbaasApi: 0.32.1 + wbaasApi: 0.33.0 redis: 17.3.8 redis2: 19.6.4