Skip to content

fix(ci): fix deployment lockups and protect database PVCs#617

Merged
DerekRoberts merged 7 commits into
mainfrom
feat/fix-merge-workflow
Jul 23, 2026
Merged

fix(ci): fix deployment lockups and protect database PVCs#617
DerekRoberts merged 7 commits into
mainfrom
feat/fix-merge-workflow

Conversation

@DerekRoberts

@DerekRoberts DerekRoberts commented Jul 20, 2026

Copy link
Copy Markdown
Member

This PR resolves the ongoing failures in the Merge to Main deployment workflow and adds robust protections for database PVCs against accidental data loss.

Changes Included:

  1. Fix main deploy lockup recovery: Removed the pull_request event gate from the pre-existing deployment cleanup step in .deploy.yml. This allows the Merge to Main workflow (triggered by workflow_run or workflow_dispatch) to detect and auto-rollback stuck releases.
  2. Prevent mid-deploy cancellations: Set cancel-in-progress to false in the Merge to Main concurrency configuration. This prevents GitHub Actions from terminating deployments mid-run and leaving Helm releases in a locked pending state.
  3. Fail-safe database PVC retention:
    • Modified values.yaml and pvc.yml templates to default to "helm.sh/resource-policy": keep for the database PVC.
    • Configured .deploy.yml to explicitly override database.pvc.keep=false only for ephemeral PR deployments (ensuring we clean up DEV resources).
    • Added a double-safe condition check and inline documentation to prevent accidental deletions on future workflows/dispatches.

@DerekRoberts
DerekRoberts requested a review from mishraomp as a code owner July 20, 2026 17:48
Copilot AI review requested due to automatic review settings July 20, 2026 17:48

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates the reusable Helm deployment workflow to always attempt cleanup of stuck/pending Helm releases, not only on pull_request events, so non-PR deploy workflows (e.g., workflow_run / workflow_dispatch) can recover from “another operation is in progress”.

Changes:

  • Removed the if: github.event_name == 'pull_request' gate from the “stop pre-existing deployments” cleanup step.
  • Updated the inline comment to no longer imply the cleanup is PR-only.

Comment thread .github/workflows/.deploy.yml Outdated
@DerekRoberts DerekRoberts moved this to Active in DevOps (NR) Jul 20, 2026
@DerekRoberts DerekRoberts self-assigned this Jul 20, 2026
@DerekRoberts DerekRoberts changed the title fix(ci): allow deploy cleanup on all workflow events fix(ci): fix deployment lockups and protect database PVCs Jul 23, 2026
@DerekRoberts
DerekRoberts enabled auto-merge (squash) July 23, 2026 22:26
@DerekRoberts DerekRoberts moved this from Active to Waiting in DevOps (NR) Jul 23, 2026

@mishraomp mishraomp left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very nice

@DerekRoberts
DerekRoberts merged commit 7bd7173 into main Jul 23, 2026
12 checks passed
@DerekRoberts
DerekRoberts deleted the feat/fix-merge-workflow branch July 23, 2026 23:05
@github-project-automation github-project-automation Bot moved this from Waiting to Done in DevOps (NR) Jul 23, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants