Skip to content

merge queue: embarking main (2389f05) and #933 together#950

Closed
mergify[bot] wants to merge 2 commits intomainfrom
mergify/merge-queue/e936ee428f
Closed

merge queue: embarking main (2389f05) and #933 together#950
mergify[bot] wants to merge 2 commits intomainfrom
mergify/merge-queue/e936ee428f

Conversation

@mergify
Copy link

@mergify mergify bot commented Mar 18, 2026

🎉 This pull request has been checked successfully and will be merged soon. 🎉

Branch main (2389f05) and #933 are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #933.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue default for merge:

Required conditions to stay in the queue:

---
checking_base_sha: 2389f05c1f42d155046597ab55e739a41e21e7de
previous_failed_batches: []
pull_requests:
  - number: 933
...

ktdreyer and others added 2 commits March 18, 2026 11:27
Adding a new OpenShift overlay currently requires copying patch files
from an existing overlay and hoping nothing was missed. Kustomize
Components let overlays compose reusable mixins instead.

Split base/ into core/, rbac/, and platform/ sub-kustomizations so
future overlays can selectively include only what they need. Extract
10 duplicated patch files into 4 components:

- oauth-proxy: OAuth sidecar + service port (production)
- postgresql-rhel: RHEL postgres image + unleash init-db
- ambient-api-server-db: API server DB connection + init
- postgresql-init-scripts: ConfigMap-based DB init (kind/e2e)

Each overlay now references shared components instead of maintaining
its own copy of identical patches. All 5 overlays produce identical
"oc kustomize" output before and after this change.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@mergify mergify bot closed this Mar 18, 2026
@mergify mergify bot deleted the mergify/merge-queue/e936ee428f branch March 18, 2026 17:25
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