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

This reverts commit a542851.

Author: adamancini

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

@@ -129,14 +129,21 @@ jobs:
             /tmp/*.log
             ~/.replicated/
 
-      - name: PR validation info
+  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
         run: |
-          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 }}"
+          task cleanup-pr-resources BRANCH_NAME="${{ needs.setup.outputs.channel-name }}" || echo "Cleanup completed with some warnings"
+        working-directory: ${{ env.APP_DIR }}
 

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

@@ -440,14 +440,7 @@ 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
-
-### 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
+5. **Automatic Cleanup** - Cleans up PR resources
 
 ### Reusable Actions
 Located in `.github/actions/` for consistent tool setup and operations:
@@ -465,14 +458,7 @@ 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 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)
-```
+PR validation runs automatically on pull requests affecting `applications/wg-easy/`. Manual trigger available via `workflow_dispatch`.
 
 ## Future Considerations