Skip to content

Reconcile develop with master (via topic branch)#88

Open
topherwhite wants to merge 4 commits into
developfrom
reconcile/master-to-develop-20260519
Open

Reconcile develop with master (via topic branch)#88
topherwhite wants to merge 4 commits into
developfrom
reconcile/master-to-develop-20260519

Conversation

@topherwhite
Copy link
Copy Markdown
Member

Brings develop in sync with master (post-tier promotion + CD strip).

Uses a topic branch as head instead of master directly to avoid delete_branch_on_merge=true auto-deleting master at merge time (which bit 4 of the 7 reconciliation PRs tonight; we recreated them but the safer pattern is to use a separate head).

topherwhite and others added 4 commits May 16, 2026 08:22
Mirrors AWS deploy; reuses rfcx/cicd/.github/workflows/rfcx-local-cd.yaml@master.
See rfcx/rfcx-api commit fc1b78ff for the pattern + initial rollout proof.
The kops production cluster has been declared dead by the operator
(2026-05-18 18:55 EDT). The AWS-targeted `build:` (ECR push) and
`deploy:` (kubectl against KUBE_CONFIG_SUPER) jobs have been
failing-or-soon-to-fail since, and rfcx-local has been the
authoritative production deploy target.

This commit:
- Drops the `build:` job (uses `rfcx/cicd/ecr-build-push.yaml`)
- Drops the `deploy:` job (uses `rfcx/cicd/k8s-deploy.yaml`)
- Updates `notify.needs` to depend only on `deploy-rfcx-local`
- Updates notify status/footer to surface the rfcx-local result

`deploy-rfcx-local` is unchanged: it does its own in-cluster
arm64 build via the self-hosted runner in the `cicd` namespace,
pushes to the in-cluster registry at 192.168.5.1:30500, and rolls
`apps-prod` Deployments via the runner's RBAC. It has no
dependency on the AWS `build:`/`deploy:` jobs.

`prepare:` and `configure:` are kept (still needed for the
branch-name gate on `deploy-rfcx-local` and for notify metadata).

`staging` is left in the on.push.branches trigger; with AWS gone
it's a no-op on staging push (deploy-rfcx-local gates on
namespace==production), which preserves the staging-promotion-PR
workflow.

See https://github.com/evity-squibbon/rfcx-local STATE.md
"AWS / kops decommission status" block for context.
ci(cd): remove AWS build+deploy jobs (kops decommissioned)
Promote staging -> master (AWS CD-strip + feat PRs)
@topherwhite
Copy link
Copy Markdown
Member Author

BLOCKED on review approval — develop branch protection requires 1 approver and I can't approve my own PR. Either approve manually or grant me maintain access; OR (less reviewable) we can disable develop branch protection here since it's not really gating anything tonight.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant