Add cluster name setup script and update notifications config for ArgoCD

Author: dcasati

.github/argocd/argocd-notifications-config.yaml

@@ -4,6 +4,10 @@ metadata:
   name: argocd-notifications-cm
   namespace: argocd
 data:
+  # Cluster name - set this to your cluster context name
+  # You can set this automatically with: kubectl patch configmap argocd-notifications-cm -n argocd -p "{\"data\":{\"cluster-name\":\"$(kubectl config current-context)\"}}"
+  cluster-name: "CLUSTER_NAME_PLACEHOLDER"
+  
   # GitHub webhook service configuration
   service.webhook.github-webhook: |
     url: https://api.github.com/repos/DevExpGbb/agentic-platform-engineering/dispatches
@@ -42,7 +46,7 @@ data:
               "message": "{{.app.status.operationState.message}}",
               "revision": "{{.app.status.sync.revision}}",
               "repo_url": "{{.app.spec.source.repoURL}}",
-              "cluster": "{{.app.spec.destination.server}}",
+              "cluster": "$cluster-name",
               "namespace": "{{.app.spec.destination.namespace}}",
               "timestamp": "{{.app.status.operationState.finishedAt}}",
               "resources": {{toJson .app.status.resources}}

.github/argocd/setup-cluster-name.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+# Run this script once when ArgoCD is installed to set the cluster name
+# Usage: ./setup-cluster-name.sh
+
+set -e
+
+CLUSTER_NAME=$(kubectl config current-context)
+
+echo "Setting cluster name in ArgoCD notifications: $CLUSTER_NAME"
+
+# Update the cluster-name in the argocd-notifications-cm ConfigMap
+kubectl patch configmap argocd-notifications-cm -n argocd \
+  -p "{\"data\":{\"cluster-name\":\"$CLUSTER_NAME\"}}"
+
+# Restart the notifications controller to pick up the change
+kubectl rollout restart deployment argocd-notifications-controller -n argocd
+
+echo "✓ Cluster name configured: $CLUSTER_NAME"
+echo ""
+echo "ArgoCD notifications will now use cluster name: $CLUSTER_NAME"

.github/workflows/argocd-deployment-failure.yml

@@ -13,20 +13,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Get cluster info
-        id: cluster-info
-        run: |
-          CLUSTER_CONTEXT=$(kubectl config current-context 2>/dev/null || echo "unknown")
-          echo "context=$CLUSTER_CONTEXT" >> $GITHUB_OUTPUT
-        continue-on-error: true
-        
       - name: Create GitHub Issue
         uses: actions/github-script@v7
         with:
           script: |
             const payload = context.payload.client_payload || {};
             const appName = payload.app_name || 'unknown';
-            const cluster = payload.cluster || 'unknown';
+            const clusterName = payload.cluster || 'in-cluster';
             const namespace = payload.namespace || 'default';
             const healthStatus = payload.health_status || 'unknown';
             const syncStatus = payload.sync_status || 'unknown';
@@ -36,10 +29,6 @@ jobs:
             const timestamp = payload.timestamp || new Date().toISOString();
             const resources = payload.resources || [];
             
-            // Get cluster name - prefer from outputs, fallback to parsing URL
-            const clusterContext = process.env.CLUSTER_CONTEXT || 'unknown';
-            let clusterName = clusterContext !== 'unknown' ? clusterContext : cluster;
-            
             // Build degraded resources section
             let degradedDetails = '';
             const degradedResources = resources.filter(r => 

Act-3/argocd-test-app.yaml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: another-kind-of-working-aks-store
+  name: half-working-aks-store
   namespace: argocd
   annotations:
     # Enable notifications on sync failures