feat: separate PR cleanup workflow to only run on merge to main

Create dedicated cleanup workflow that only runs when PRs are merged to main,
rather than on every PR update. This prevents interference with active
development and debugging while ensuring proper resource cleanup.

Changes:
- Add wg-easy-pr-cleanup.yaml workflow triggered only on PR merge
- Remove cleanup job from wg-easy-pr-validation.yaml
- Add informational message about resource cleanup in validation workflow
- Update CLAUDE.md documentation to explain new cleanup strategy
- Maintain same cleanup logic using task cleanup-pr-resources

Benefits:
- Resources remain available during PR development for testing/debugging
- No unnecessary cleanup API calls during PR updates
- Clear separation of validation vs cleanup concerns
- Manual cleanup option still available via task command

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

Author: adamancini

.github/workflows/wg-easy-pr-cleanup.yaml

@@ -0,0 +1,57 @@
+---
+name: WG-Easy PR Cleanup - clean up resources after merge
+
+on:
+  pull_request:
+    types: [closed]
+    branches: [main]
+    paths:
+      - 'applications/wg-easy/**'
+      - '.github/workflows/wg-easy-pr-validation.yaml'
+      - '.github/workflows/wg-easy-pr-cleanup.yaml'
+
+env:
+  APP_DIR: applications/wg-easy
+  REPLICATED_API_TOKEN: ${{ secrets.WG_EASY_REPLICATED_API_TOKEN }}
+  REPLICATED_APP: ${{ secrets.WG_EASY_REPLICATED_APP }}
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-22.04
+    # Only run cleanup when PR is actually merged to main
+    if: github.event.pull_request.merged == true
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set branch and channel variables
+        id: vars
+        run: |
+          # Use the head branch name for cleanup (the branch that was merged)
+          BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
+          # Channel name is normalized to lowercase with hyphens for Replicated channels
+          CHANNEL_NAME=$(echo "$BRANCH_NAME" | tr '[:upper:]' '[:lower:]' | tr '/' '-')
+          echo "branch-name=$BRANCH_NAME" >> $GITHUB_OUTPUT
+          echo "channel-name=$CHANNEL_NAME" >> $GITHUB_OUTPUT
+          echo "Cleaning up resources for merged branch: $BRANCH_NAME (channel: $CHANNEL_NAME)"
+
+      - name: Setup tools
+        uses: ./.github/actions/setup-tools
+        with:
+          app-dir: ${{ env.APP_DIR }}
+
+      - name: Cleanup PR resources
+        run: |
+          echo "Starting cleanup for merged PR branch: ${{ steps.vars.outputs.branch-name }}"
+          task cleanup-pr-resources BRANCH_NAME="${{ steps.vars.outputs.channel-name }}" || echo "Cleanup completed with some warnings"
+          echo "Cleanup completed for merged PR"
+        working-directory: ${{ env.APP_DIR }}
+
+      - name: Report cleanup status
+        if: always()
+        run: |
+          if [ $? -eq 0 ]; then
+            echo "✅ Successfully cleaned up resources for merged PR: ${{ steps.vars.outputs.branch-name }}"
+          else
+            echo "⚠️ Cleanup completed with warnings for merged PR: ${{ steps.vars.outputs.branch-name }}"
+          fi

.github/workflows/wg-easy-pr-validation.yaml

@@ -129,21 +129,14 @@ jobs:
             /tmp/*.log
             ~/.replicated/
 
-  cleanup:
-    runs-on: ubuntu-22.04
-    needs: [setup, test-deployment]
-    if: always()
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup tools
-        uses: ./.github/actions/setup-tools
-        with:
-          app-dir: ${{ env.APP_DIR }}
-
-      - name: Cleanup PR resources
+      - name: PR validation info
         run: |
-          task cleanup-pr-resources BRANCH_NAME="${{ needs.setup.outputs.channel-name }}" || echo "Cleanup completed with some warnings"
-        working-directory: ${{ env.APP_DIR }}
+          echo "🎉 PR validation completed successfully!"
+          echo "📋 Resources created for this PR:"
+          echo "  - Customer: ${{ needs.setup.outputs.channel-name }}"
+          echo "  - Cluster: ${{ needs.setup.outputs.channel-name }}"
+          echo "  - Channel: ${{ needs.setup.outputs.channel-name }}"
+          echo ""
+          echo "ℹ️  Resources will be automatically cleaned up when this PR is merged to main."
+          echo "   For manual cleanup, run: task cleanup-pr-resources BRANCH_NAME=${{ needs.setup.outputs.channel-name }}"
 

applications/wg-easy/CLAUDE.md

@@ -440,7 +440,14 @@ The `wg-easy-pr-validation.yaml` workflow is structured for maximum efficiency:
 2. **Chart Packaging** - Builds once, shares artifacts between jobs  
 3. **Release Creation** - Creates Replicated channel and release
 4. **Deployment Testing** - Tests full customer workflow
-5. **Automatic Cleanup** - Cleans up PR resources
+
+### PR Cleanup Workflow
+The `wg-easy-pr-cleanup.yaml` workflow handles resource cleanup:
+
+- **Triggers**: Only runs when PRs are merged to main (not on every PR update)
+- **Resources Cleaned**: Customers, clusters, and channels created during PR validation
+- **Smart Cleanup**: Uses the same `task cleanup-pr-resources` with proper branch name normalization
+- **Graceful Handling**: Continues cleanup even if some resources are already deleted
 
 ### Reusable Actions
 Located in `.github/actions/` for consistent tool setup and operations:
@@ -458,7 +465,14 @@ Located in `.github/actions/` for consistent tool setup and operations:
 - **Maintainability** - Logic centralized in Taskfile, not scattered in YAML
 
 ### Usage
-PR validation runs automatically on pull requests affecting `applications/wg-easy/`. Manual trigger available via `workflow_dispatch`.
+**PR Validation**: Runs automatically on pull requests affecting `applications/wg-easy/`. Manual trigger available via `workflow_dispatch`.
+
+**PR Cleanup**: Runs automatically when PRs are merged to main. Resources remain available during PR development for testing and debugging.
+
+**Manual Cleanup**: If needed, cleanup can be run manually:
+```bash
+task cleanup-pr-resources BRANCH_NAME=$(git branch --show-current)
+```
 
 ## Future Considerations