Skip to content

🌱 Consolidate kind-* Makefile targets into pattern rules#2792

Open
pedjak wants to merge 1 commit into
operator-framework:mainfrom
pedjak:consolidate-kind-targets
Open

🌱 Consolidate kind-* Makefile targets into pattern rules#2792
pedjak wants to merge 1 commit into
operator-framework:mainfrom
pedjak:consolidate-kind-targets

Conversation

@pedjak

@pedjak pedjak commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

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_MANIFEST into SOURCE_MANIFEST/MANIFEST so the same kind-deploy-% recipe serves both dev and e2e workflows.

Addresses review feedback from #2785.

Reviewer Checklist

  • API Go Documentation
  • Tests: Unit Tests (and E2E Tests, if appropriate)
  • Comprehensive Commit Messages
  • Links to related GitHub Issue(s)

Copilot AI review requested due to automatic review settings June 30, 2026 18:58
@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 30, 2026
@netlify

netlify Bot commented Jun 30, 2026

Copy link
Copy Markdown

Deploy Preview for olmv1 ready!

Name Link
🔨 Latest commit 76dc5bc
🔍 Latest deploy log https://app.netlify.com/projects/olmv1/deploys/6a442dcfc8571e0008846d9b
😎 Deploy Preview https://deploy-preview-2792--olmv1.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.
🤖 Make changes Run an agent on this branch

To edit notification comments on pull requests, go to your Netlify project configuration.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

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 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 run for 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.

Comment thread Makefile
Comment thread Makefile
Comment thread Makefile Outdated
Comment thread Makefile
@pedjak pedjak marked this pull request as ready for review June 30, 2026 20:37
Copilot AI review requested due to automatic review settings June 30, 2026 20:37
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 30, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 4 comments.

Comment thread Makefile
Comment thread Makefile
Comment thread Makefile
Comment thread Makefile
@pedjak pedjak requested review from perdasilva and tmshort and removed request for joelanford June 30, 2026 20:50
@pedjak

pedjak commented Jun 30, 2026

Copy link
Copy Markdown
Contributor Author

/cc @tmshort

@tmshort

tmshort commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

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 pedjak force-pushed the consolidate-kind-targets branch from d945072 to 76dc5bc Compare June 30, 2026 20:57
@pedjak

pedjak commented Jun 30, 2026

Copy link
Copy Markdown
Contributor Author

You may want to address copilot comments?

@tmshort just did it, ptal

@tmshort

tmshort commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

Is this an alternative to #2790, or an addition?
EDIT: They seem to be interrelated

@openshift-ci

openshift-ci Bot commented Jun 30, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: rashmigottipati
Once this PR has been reviewed and has the lgtm label, please assign grokspawn for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 30, 2026
@pedjak

pedjak commented Jun 30, 2026

Copy link
Copy Markdown
Contributor Author

Is this an alternative to #2790, or an addition? EDIT: They seem to be interrelated

This is follow-up of #2785 (comment)

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

Labels

lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants