🌱 Consolidate kind-* Makefile targets into pattern rules#2792
Conversation
openshift-ci
Bot
added
the
do-not-merge/work-in-progress
✅ Deploy Preview for olmv1 ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
There was a problem hiding this comment.
Pull request overview
This PR refactors the Makefile’s KIND workflow by consolidating standalone kind-* targets into pattern-rule equivalents, aiming to reduce recipe drift and unify manifest variables across dev and e2e flows.
Changes:
- Reworks KIND operations to use pattern rules where the stem (
$*) is the full cluster name, with top-level shortcut targets delegating to the pattern rules. - Unifies e2e/dev manifest variable naming so the same
kind-deploy-%recipe can serve both workflows. - Updates contributor docs to recommend
make runfor local Kind-based development.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
| Makefile | Consolidates KIND targets into pattern rules, updates e2e variable wiring, and adjusts run/upgrade/e2e target chains accordingly. |
| CONTRIBUTING.md | Simplifies local Kind workflow instructions to use make run. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
openshift-ci
Bot
removed
the
do-not-merge/work-in-progress
pedjak
requested review from
perdasilva and
tmshort
and removed request for
joelanford
|
/cc @tmshort |
|
You may want to address copilot comments? |
Replace standalone kind-cluster, kind-load, kind-deploy, kind-deploy-experimental, kind-clean, lint-deployed-resources, wait, and run-internal targets with pattern-rule counterparts (kind-cluster-%, kind-load-%, kind-deploy-%, etc.) where the stem is the full cluster name. Standalone targets are redeclared as thin shortcuts delegating to pattern rules with $(KIND_CLUSTER_NAME) as the stem. This eliminates recipe drift between the two sets of targets. Unify E2E_SOURCE_MANIFEST/E2E_RELEASE_MANIFEST into SOURCE_MANIFEST/ MANIFEST so the same kind-deploy-% recipe serves both dev and e2e workflows. Co-Authored-By: Claude <noreply@anthropic.com>
pedjak
force-pushed
the
consolidate-kind-targets
branch
from
d945072 to
76dc5bc
Compare
@tmshort just did it, ptal |
|
Is this an alternative to #2790, or an addition? |
This is follow-up of #2785 (comment) |
|
/hold |
openshift-ci
Bot
added
the
do-not-merge/hold
|
/unhold |
openshift-ci
Bot
removed
the
do-not-merge/hold
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: perdasilva, rashmigottipati The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
Bot
added
the
approved
openshift-merge-bot
Bot
merged commit 4575d83
into
operator-framework:main
Description
Consolidate standalone
kind-*Makefile targets (kind-cluster,kind-load,kind-deploy,kind-deploy-experimental,kind-clean,lint-deployed-resources,wait,run-internal) into their pattern-rule counterparts (kind-cluster-%,kind-load-%,kind-deploy-%, etc.), where the stem ($*) is the full cluster name.Standalone targets are redeclared as thin shortcuts delegating to pattern rules with
$(KIND_CLUSTER_NAME)as the stem, eliminating recipe drift between the two sets of targets.Also unifies
E2E_SOURCE_MANIFEST/E2E_RELEASE_MANIFESTintoSOURCE_MANIFEST/MANIFESTso the samekind-deploy-%recipe serves both dev and e2e workflows.Addresses review feedback from #2785.
Reviewer Checklist