OPRUN-4268: Add AGENTS.md to allow agents to make contributions to the codebase by rashmigottipati · Pull Request #580 · openshift/operator-framework-operator-controller

rashmigottipati · 2025-12-11T16:26:10Z

Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>

ankitathomas

/lgtm

grokspawn · 2025-12-11T16:37:48Z

+1. **Understand the intent:** Is this fixing an OpenShift-specific issue or an upstream bug?
+
+2. **Choose the right approach:**
+ - If it's an upstream bug → Should be fixed in `operator-framework/operator-controller` first, then cherry-picked


Not cherry-picked. The downstream-related tooling should be allowed to execute, replaying commits against our fork of the upstream branch, once that has been fast-forwarded.

grokspawn · 2025-12-11T16:44:59Z

+
+1. **The fix should ideally go to upstream `operator-framework/operator-controller` first**
+2. **Then cherry-pick** to OpenShift using `UPSTREAM: <PR number>:` format
+3. **Only use `UPSTREAM: <carry>:`** for truly OpenShift-specific behavior


Suggested change
3.**Only use `UPSTREAM: <carry>:`** for truly OpenShift-specific behavior
3.**Only use `UPSTREAM: <carry>:`** for truly OpenShift-specific behavior for content which is not generated

grokspawn · 2025-12-11T16:47:33Z

+| OpenShift integration | `UPSTREAM: <carry>:` | ❌ NO - Downstream only |
+| OpenShift config | `UPSTREAM: <carry>:` | ❌ NO - Downstream only |
+| Remove upstream file | `UPSTREAM: <drop>:` | ❌ NO - Downstream only |
+| Generated files | `UPSTREAM: <drop>:` | ❌ NO - Regenerate with `make manifests` |


This contradicts previous guidance here which implies that generated stuff which we need to temporarily resolve until some later PR should use this process.

But it is something we do, and something I have done.

grokspawn · 2025-12-11T16:49:57Z

There's some duplicated and internally contradictory content here. Could you re-run this through claude with a "be concise and consistent" prompt modification? If you also direct it to resolve PR comments then you should be able to get to a happy update in a single step.

Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>

tmshort · 2025-12-11T18:39:41Z

TL;DR: we don't cherry-pick to the main branch. We allow the bumper (in openshift/operator-framework-tooling) synchronize from upstream.

However, cherry-picking would be done on release branches, but since most downstream work is on the main branch, cherry-picking is uncommon.

We would almost never see UPSTREAM: pr-number commits. because they would create a conflict on the next upstream sync. Instead, we might do an UPSTREAM: <drop> commit to pull down a fix early, as it then gets dropped on the next sync.

UPSTREAM: <carry> is used for most changes, and 99% of the time, those changes ought to be limited to the openshift directory. Code outside of the openshift directory should generally not be modified downstream; it should be modified upstream and then synced downstream.

UPSTREAM: <drop> is for temporary commits (e.g. the upstream PR example) that are to be dropped on the next sync. They are used by the bumper to create commits that are easier to recreate than to rebase/cherry-pick. For example: UPSTREAM: <drop>: remove upstream GitHub configuration

EDIT: You updated the file as I was writing this... so looking 👀 again.

ankitathomas

/lgtm

tmshort · 2025-12-11T18:45:34Z

This version is much better. I think I had just one comment on the frequency of the synchronization.

Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>

tmshort · 2025-12-11T18:48:58Z

/lgtm

Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>

tmshort · 2025-12-11T19:13:44Z

/lgtm

tmshort · 2025-12-11T19:13:50Z

/approve

openshift-ci · 2025-12-11T19:34:08Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ankitathomas, grokspawn, rashmigottipati, tmshort

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~DOWNSTREAM_OWNERS~~ [grokspawn,tmshort]

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

tmshort · 2025-12-11T19:36:41Z

/label acknowledge-critical-fixes-only

tmshort · 2025-12-11T19:42:34Z

/retitle NO-ISSUE: Add AGENTS.md to allow agents to make contributions to the codebase

openshift-ci-robot · 2025-12-11T19:42:41Z

@rashmigottipati: This pull request explicitly references no jira issue.

Details

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2025-12-11T19:55:54Z

@rashmigottipati: This pull request references OPRUN-4268 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

Details

In response to this:

Fixes: OPRUN-4268

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

rashmigottipati · 2025-12-11T19:58:22Z

/refresh

bandrade · 2025-12-11T20:23:16Z

/label qe-approved
/verified by @bandrade

openshift-ci-robot · 2025-12-11T20:23:27Z

@rashmigottipati: This pull request references OPRUN-4268 which is a valid jira issue.

Details

In response to this:

Fixes: OPRUN-4268

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2025-12-11T20:23:28Z

@bandrade: This PR has been marked as verified by @bandrade.

Details

In response to this:

/label qe-approved
/verified by @bandrade

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci · 2025-12-11T22:22:04Z

@rashmigottipati: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Add AGENTS.md for AI code contributions
e6e31cd
Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>

openshift-ciBot requested review from joelanford and oceanc80 December 11, 2025 16:27

grokspawn reviewed Dec 11, 2025
View reviewed changes

Comment threadopenshift/AGENTS.md Outdated

grokspawn reviewed Dec 11, 2025
View reviewed changes

Comment threadopenshift/AGENTS.md Outdated

grokspawn reviewed Dec 11, 2025
View reviewed changes

Comment threadopenshift/AGENTS.md Outdated

ankitathomas approved these changes Dec 11, 2025
View reviewed changes

openshift-ciBot assigned ankitathomas Dec 11, 2025

openshift-ciBot added the lgtm Indicates that a PR is ready to be merged. label Dec 11, 2025

grokspawn reviewed Dec 11, 2025
View reviewed changes

Comment threadopenshift/AGENTS.md Outdated

grokspawn reviewed Dec 11, 2025
View reviewed changes

Comment threadopenshift/AGENTS.md Outdated

grokspawn reviewed Dec 11, 2025
View reviewed changes

Comment threadopenshift/AGENTS.md Outdated

grokspawn reviewed Dec 11, 2025
View reviewed changes

Comment threadopenshift/AGENTS.md Outdated

grokspawn reviewed Dec 11, 2025
View reviewed changes

address review comments through addl prompts
be5f2e9
Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>

openshift-ciBot removed the lgtm Indicates that a PR is ready to be merged. label Dec 11, 2025

rashmigottipati requested a review from grokspawn December 11, 2025 18:21

tmshort reviewed Dec 11, 2025
View reviewed changes

Comment threadopenshift/AGENTS.md Outdated

tmshort reviewed Dec 11, 2025
View reviewed changes

Comment threadopenshift/AGENTS.md Outdated

ankitathomas approved these changes Dec 11, 2025
View reviewed changes

openshift-ciBot added the lgtm Indicates that a PR is ready to be merged. label Dec 11, 2025

addressing some more review comments
7a1d590
Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>

rashmigottipati force-pushed the add-agents-file branch from 3cc0cef to 7a1d590Compare December 11, 2025 18:47

openshift-ciBot removed the lgtm Indicates that a PR is ready to be merged. label Dec 11, 2025

openshift-ciBot assigned tmshort Dec 11, 2025

openshift-ciBot added the lgtm Indicates that a PR is ready to be merged. label Dec 11, 2025

joelanford reviewed Dec 11, 2025
View reviewed changes

Comment threadopenshift/AGENTS.md Outdated

remove DCO line
a5388a3
Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>

openshift-ciBot removed the lgtm Indicates that a PR is ready to be merged. label Dec 11, 2025

openshift-ciBot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Dec 11, 2025

grokspawn approved these changes Dec 11, 2025
View reviewed changes

openshift-ciBot assigned grokspawn Dec 11, 2025

openshift-ciBot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Dec 11, 2025

openshift-ciBot changed the title ~~Add AGENTS.md to allow agents to make contributions to the codebase~~NO-ISSUE: Add AGENTS.md to allow agents to make contributions to the codebaseDec 11, 2025

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 11, 2025

rashmigottipati changed the title ~~NO-ISSUE: Add AGENTS.md to allow agents to make contributions to the codebase~~OPRUN-4268: Add AGENTS.md to allow agents to make contributions to the codebaseDec 11, 2025

openshift-ciBot added the qe-approved Signifies that QE has signed off on this PR label Dec 11, 2025

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Dec 11, 2025

openshift-merge-botBot merged commit 47053e9 into openshift:mainDec 11, 2025
11 checks passed

rashmigottipati deleted the add-agents-file branch December 11, 2025 22:28

	3.Only use `UPSTREAM: <carry>:` for truly OpenShift-specific behavior
	3.Only use `UPSTREAM: <carry>:` for truly OpenShift-specific behavior for content which is not generated

Uh oh!

Conversation

rashmigottipati commented Dec 11, 2025• edited by openshift-ci BotLoading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ankitathomas left a comment

Choose a reason for hiding this comment

Uh oh!

grokspawnDec 11, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

grokspawnDec 11, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

grokspawnDec 11, 2025

Choose a reason for hiding this comment

Uh oh!

tmshortDec 11, 2025

Choose a reason for hiding this comment

Uh oh!

grokspawn commented Dec 11, 2025

Uh oh!

Uh oh!

tmshort commented Dec 11, 2025• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

ankitathomas left a comment

Choose a reason for hiding this comment

Uh oh!

tmshort commented Dec 11, 2025

Uh oh!

tmshort commented Dec 11, 2025

Uh oh!

Uh oh!

tmshort commented Dec 11, 2025

Uh oh!

tmshort commented Dec 11, 2025

Uh oh!

openshift-ciBot commented Dec 11, 2025

Uh oh!

tmshort commented Dec 11, 2025

Uh oh!

tmshort commented Dec 11, 2025

Uh oh!

openshift-ci-robot commented Dec 11, 2025

Uh oh!

openshift-ci-robot commented Dec 11, 2025• edited by openshift-ci BotLoading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rashmigottipati commented Dec 11, 2025

Uh oh!

bandrade commented Dec 11, 2025

Uh oh!

openshift-ci-robot commented Dec 11, 2025• edited by openshift-ci BotLoading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Dec 11, 2025

Uh oh!

openshift-ciBot commented Dec 11, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

rashmigottipati commented Dec 11, 2025•
edited by openshift-ci Bot
Loading

tmshort commented Dec 11, 2025•
edited
Loading

openshift-ci-robot commented Dec 11, 2025•
edited by openshift-ci Bot
Loading

openshift-ci-robot commented Dec 11, 2025•
edited by openshift-ci Bot
Loading