From e4824eb9161e6ba00af2482317b83f15190a5899 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Fri, 19 Dec 2025 17:47:13 +0100
Subject: [PATCH 1/4] add mattermost secret in terraform

---
 tf/env/local/secrets-argo.tf | 11 +++++++++++
 tf/env/local/variables.tf    |  6 ++++++
 2 files changed, 17 insertions(+)
 create mode 100644 tf/env/local/secrets-argo.tf

diff --git a/tf/env/local/secrets-argo.tf b/tf/env/local/secrets-argo.tf
new file mode 100644
index 000000000..db3ba73f9
--- /dev/null
+++ b/tf/env/local/secrets-argo.tf
@@ -0,0 +1,11 @@
+resource "kubernetes_secret" "argo-notifications-secret" {
+
+  metadata {
+    namespace = "argocd"
+    name      = "argocd-notifications-secret"
+  }
+
+  data = {
+    "mattermost-token" = var.mattermost_bot_token,
+  }
+}
diff --git a/tf/env/local/variables.tf b/tf/env/local/variables.tf
index 2c378901c..b5dc1ae04 100644
--- a/tf/env/local/variables.tf
+++ b/tf/env/local/variables.tf
@@ -39,3 +39,9 @@ variable "botstopper_image_pull_json_secret" {
   description = "Base64 Encoding of a docker/config.json to pull the botstopper image"
   sensitive   = true
 }
+
+variable "mattermost_bot_token" {
+  type        = string
+  description = "Base64 Encoding of a docker/config.json to pull the botstopper image"
+  sensitive   = true
+}
\ No newline at end of file

From 023cb230123239ea867ba096bcf0d80333e44702 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Fri, 19 Dec 2025 17:47:50 +0100
Subject: [PATCH 2/4] change argo helmfile to use pure yaml files

---
 k8s/helmfile/argo-cd.yaml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/k8s/helmfile/argo-cd.yaml b/k8s/helmfile/argo-cd.yaml
index f99b82f03..d6d87c6a0 100644
--- a/k8s/helmfile/argo-cd.yaml
+++ b/k8s/helmfile/argo-cd.yaml
@@ -14,16 +14,12 @@ repositories:
   - name: argo-cd
     url: https://argoproj.github.io/argo-helm
 
-templates:
-  default: &default_release
-    missingFileHandler: Error
-    values:
-      - env/production/{{`{{ .Release.Name }}`}}.values.yaml.gotmpl
-      - env/{{`{{ .Environment.Name }}`}}/{{`{{ .Release.Name }}`}}.values.yaml.gotmpl
-
 releases:
   - name: argo-cd-base
     namespace: argocd
     chart: argo-cd/argo-cd
-    version: '7.6.11'
-    <<: *default_release
+    version: '9.1.9'
+    missingFileHandler: Error
+    values:
+      - env/production/{{`{{ .Release.Name }}`}}.values.yaml
+      - env/{{`{{ .Environment.Name }}`}}/{{`{{ .Release.Name }}`}}.values.yaml

From 4a12d1bfe5371d482d88a79c99b22cf8b53ac37f Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Fri, 19 Dec 2025 17:48:36 +0100
Subject: [PATCH 3/4] local conf

---
 .../env/local/argo-cd-base.values.yaml        | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 k8s/helmfile/env/local/argo-cd-base.values.yaml

diff --git a/k8s/helmfile/env/local/argo-cd-base.values.yaml b/k8s/helmfile/env/local/argo-cd-base.values.yaml
new file mode 100644
index 000000000..053016959
--- /dev/null
+++ b/k8s/helmfile/env/local/argo-cd-base.values.yaml
@@ -0,0 +1,57 @@
+configs:
+  params:
+    server.insecure: "true"
+
+  cm:
+    admin.enabled: "true"
+
+    ui.bannercontent: "LOCAL"
+    ui.bannerurl: "http://www.wbaas.dev/"
+
+  styles: |
+    .ui-banner {
+        background-color:#6d7f8b;
+
+        a {
+          color:white;
+        }
+    }
+
+global:
+  domain: argo.wbaas.dev
+
+certificate:
+  enabled: true
+
+server:
+  ingress:
+    enabled: true
+    ingressClassName: nginx
+
+notifications:
+  notifiers:
+    service.mattermost: |
+      apiURL: https://mattermost.wikimedia.de
+      token: $mattermost-token
+  secret:
+    create: false
+
+  subscriptions:
+    - recipients:
+      - mattermost:3kk8aywgrjf4fmxfqkm6fusbcr
+
+  templates:
+    template.app-sync-succeeded: |
+      mattermost:
+        attachments: '[{"title":"{{.app.status.sync.status}} {{.app.metadata.name}} on {{.app.spec.project}}","title_link":"{{.context.argocdUrl}}/applications/{{.app.metadata.name}}","color":"#18be52","fields":[{"title":"Timestamp","value":"{{.app.status.operationState.finishedAt}}","short":true},{"title":"Details","value":"{{.context.argocdUrl}}/applications/{{.app.metadata.name}}?operation=true .","short":true}]}]'
+
+  triggers:
+    # trigger.on-deleted: |
+    #   oncePer: app.status.sync.revision
+    #   send: [app-deleted]
+
+    trigger.on-sync-succeeded: |
+      - description: Application syncing has succeeded
+        send:
+        - app-sync-succeeded
+        when: "true"
\ No newline at end of file

From 34010f6ef4367610940931d2013b4f883d167273 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Fri, 19 Dec 2025 18:04:36 +0100
Subject: [PATCH 4/4] linitng

---
 k8s/helmfile/env/local/argo-cd-base.values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/k8s/helmfile/env/local/argo-cd-base.values.yaml b/k8s/helmfile/env/local/argo-cd-base.values.yaml
index 053016959..0e2163908 100644
--- a/k8s/helmfile/env/local/argo-cd-base.values.yaml
+++ b/k8s/helmfile/env/local/argo-cd-base.values.yaml
@@ -38,7 +38,7 @@ notifications:
 
   subscriptions:
     - recipients:
-      - mattermost:3kk8aywgrjf4fmxfqkm6fusbcr
+        - mattermost:3kk8aywgrjf4fmxfqkm6fusbcr
 
   templates:
     template.app-sync-succeeded: |
@@ -54,4 +54,4 @@ notifications:
       - description: Application syncing has succeeded
         send:
         - app-sync-succeeded
-        when: "true"
\ No newline at end of file
+        when: "true"