test: pr

cterence · Jan 19, 2025 · f435eef · f435eef
1 parent cfcce21
commit f435eef
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/.github/workflows/pr-argo-diff.yaml b/.github/workflows/pr-argo-diff.yaml
@@ -11,29 +11,39 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Set up environment
         run: |
           # Install ArgoCD CLI
           curl -sSL -o /usr/local/bin/argocd https://github.com/argoproj/argo-cd/releases/latest/download/argocd-linux-amd64
           chmod +x /usr/local/bin/argocd
 
-      - name: Get updated charts
-        id: updated-charts
+      - name: Get updated apps
+        id: updated-apps
         run: |
-          UPDATED_APPS=$(git diff --name-only origin/main...HEAD | grep '^k8s-apps/' | awk -F'/' '{print $2}' | sort -u)
-          echo "Updated charts: $UPDATED_APPS"
-          echo "::set-output name=apps::$UPDATED_APPS"
+          git fetch origin  # Ensure the latest refs are fetched
+          # Extract unique app names from the modified paths under k8s-apps
+          MODIFIED_APPS=$(git diff --name-only origin/main...HEAD | grep '^k8s-apps/' | awk -F'/' '{print $2}' | sort -u | xargs)
+          if [ -z "$MODIFIED_APPS" ]; then
+            echo "No changes detected"
+            echo "apps=" >> $GITHUB_OUTPUT
+          else
+            echo "Modified apps: $MODIFIED_APPS"
+            echo "apps=$MODIFIED_APPS" >> $GITHUB_OUTPUT
 
       - name: Login to ArgoCD
-        if: steps.updated-charts.outputs.apps != ''
+        if: steps.updated-apps.outputs.apps != ''
         run: |
-          argocd login --grpc-web --username admin --password $ARGOCD_ADMIN_PASSWORD argocd.terence.cloud
+          argocd login argocd.terence.cloud --grpc-web --username admin --password $ARGOCD_ADMIN_PASSWORD
+        env:
+          ARGOCD_ADMIN_PASSWORD: ${{ secrets.ARGOCD_ADMIN_PASSWORD }}
 
       - name: ArgoCD Diff for updated apps
-        if: steps.updated-charts.outputs.apps != ''
+        if: steps.updated-apps.outputs.apps != ''
         run: |
-          for APP in ${{ steps.updated-charts.outputs.apps }}; do
+          for APP in ${{ steps.updated-apps.outputs.apps }}; do
             echo "Processing app: $APP"
             cd "k8s-apps/$APP"
             argocd app diff "$APP" \
@@ -42,5 +52,3 @@ jobs:
               --local $PWD \
               --loglevel warn
           done
-        env:
-          ARGOCD_ADMIN_PASSWORD: ${{ secrets.ARGOCD_ADMIN_PASSWORD }}
diff --git a/k8s-apps/argocd/values.yaml b/k8s-apps/argocd/values.yaml
@@ -361,7 +361,7 @@ argo-cd:
       # paths:
       #   - /argocd(/|$)(.*)
       hostname:
-        argocd.terence.cloud
+        argocd.terence.clouds
         # - k8s-ingress.snow-delta.ts.net
       tls: true
       ingressClassName: nginx