change

dev/argocd/values.yaml

@@ -1,3 +1,6 @@
+global:
+  domain: argocd-dev.allarddcs.nl
+
 ingress:
   server:
     enabled: true
@@ -11,57 +14,6 @@ ingress:
           - argocd-dev.allarddcs.nl
         secretName: argocd-tls-cert
 
-configs:
-  params:
-    # disable insecure (HTTP)
-    server.insecure: "false"
-
-configs:
-  resource.customizations: |
-    rbac.authorization.k8s.io/ClusterRole:
-      ignoreDifferences: |
-        jsonPointers:
-          - /metadata/annotations/argocd.argoproj.io~1tracking-id
-    rbac.authorization.k8s.io/ClusterRoleBinding:
-      ignoreDifferences: |
-        jsonPointers:
-          - /metadata/annotations/argocd.argoproj.io~1tracking-id
-
-server:
-  tls:
-    enabled: true
-    # name of the TLS secret (created via cert-manager)
-    secretName: argocd-tls-cert
-
-repoServer:
-  extraArgs:
-    - --parallelismlimit=1
-
-  readinessProbe:
-    initialDelaySeconds: 10
-    periodSeconds: 5
-    timeoutSeconds: 2
-    failureThreshold: 10
-
-  livenessProbe:
-    initialDelaySeconds: 10
-    periodSeconds: 10
-    timeoutSeconds: 2
-    failureThreshold: 10
-ingress:
-  server:
-    enabled: true
-    ingressClassName: traefik
-    hosts:
-      - host: argocd-dev.allarddcs.nl
-        paths:
-          - "/"
-    tls:
-      - hosts:
-          - argocd-dev.allarddcs.nl
-        secretName: argocd-tls-cert
-
-configs:
   params:
     server.insecure: "false"
 
@@ -83,44 +35,66 @@ server:
 repoServer:
   extraArgs:
     - --parallelismlimit=1
+
   readinessProbe:
     initialDelaySeconds: 10
     periodSeconds: 5
     timeoutSeconds: 2
     failureThreshold: 10
+
   livenessProbe:
     initialDelaySeconds: 10
     periodSeconds: 10
     timeoutSeconds: 2
     failureThreshold: 10
 
-# ---------------- Notifications ----------------
 notifications:
   enabled: true
-
+  name: notifications-controller
+  # Context available in templates
   context:
-    argocdUrl: https://argocd-dev.allarddcs.nl
+    argocdUrl: "https://argocd-dev.allarddcs.nl"
 
-  config:
-    # SMTP email service
-    service.email.smtp: |
-      username: argocd@allarddcs.nl
-      password: Argocd01@
-      host: smtp.allarddcs.nl
-      port: 587
-      from: argocd@allarddcs.nl
+  # Secret for SMTP credentials
+  secret:
+    create: true
+    name: argocd-notifications-secret
+    items:
+      email-username: "argocd@allarddcs.nl"
+      email-password: "Argocd01@"
 
-    # Optional template for sync failure
-    template.app-sync-failed: |
-      subject: ArgoCD: Application {{.app.metadata.name}} sync failed
-      body: |
-        Application {{.app.metadata.name}} failed to sync.
-        Status: {{.app.status.sync.status}}
-        Health: {{.app.status.health.status}}
+  # ConfigMap used by notifications-controller
+  cm:
+    create: false
+    extra:
+      service.email.smtp: |
+        host: mail.allarddcs.nl
+        port: 587
+        from: argocd@allarddcs.nl
+        username: argocd@allarddcs.nl
+        password: Argocd01@
+        starttls: true
 
-  # Global subscription for all apps
+  # Templates
+  templates:
+    app-sync-failed: |
+      email:
+        subject: Failed to sync application {{.app.metadata.name}}.
+      message: |
+        The sync of {{.app.metadata.name}} failed at {{.app.status.operationState.finishedAt}}.
+        Error: {{.app.status.operationState.message}}
+        More details: {{.context.argocdUrl}}/applications/{{.app.metadata.name}}?operation=true
+
+  # Triggers
+  triggers:
+    on-sync-failed: |
+      - description: Application syncing has failed
+        send: [app-sync-failed]
+        when: app.status.operationState != nil and app.status.operationState.phase in ['Error','Failed']
+
+  # Subscriptions
   subscriptions:
     - recipients:
         - admin@allarddcs.nl
       triggers:
-        - app-sync-failed
+        - on-sync-failed