✨ add support for receiving kubeconfig in op-con/catd options by grokspawn · Pull Request #2562 · operator-framework/operator-controller

grokspawn · 2026-03-12T20:06:40Z

Description

Adds the ability for op-con / catd to interact with a non-default apiserver

Reviewer Checklist

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

netlify · 2026-03-12T20:06:46Z

✅ Deploy Preview for olmv1 ready!

Name	Link
🔨 Latest commit	`d68417a`
🔍 Latest deploy log	https://app.netlify.com/projects/olmv1/deploys/69b3236b5b94140008565cc4
😎 Deploy Preview	https://deploy-preview-2562--olmv1.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

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

Copilot

Pull request overview

Adds a --kubeconfig CLI option to let operator-controller and catalogd connect to a non-default Kubernetes API server (e.g., HyperShift scenarios), instead of always using the default controller-runtime config loading behavior.

Changes:

Add --kubeconfig flag to operator-controller and catalogd.
When --kubeconfig is provided, build the REST config from the specified kubeconfig file before creating the controller-runtime manager.

Reviewed changes

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

File	Description
cmd/operator-controller/main.go	Adds `--kubeconfig` flag and uses it to construct the REST config passed to `ctrl.NewManager`.
cmd/catalogd/main.go	Adds `--kubeconfig` flag and uses it to construct the REST config passed to `ctrl.NewManager`.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.

codecov · 2026-03-12T20:26:47Z

Codecov Report

❌ Patch coverage is 42.85714% with 12 lines in your changes missing coverage. Please review.
✅ Project coverage is 64.25%. Comparing base (6692d1b) to head (d68417a).
⚠️ Report is 15 commits behind head on main.

Files with missing lines	Patch %	Lines
cmd/catalogd/main.go	45.45%	5 Missing and 1 partial ⚠️
cmd/operator-controller/main.go	40.00%	5 Missing and 1 partial ⚠️

Additional details and impacted files

@@ Coverage Diff @@## main #2562 +/- ##
==========================================
- Coverage 68.65% 64.25% -4.41% 
==========================================
Files 131 131 Lines 9333 9352 +19 ==========================================
- Hits 6408 6009 -399 - Misses 2436 2864 +428 + Partials 489 479 -10

Flag	Coverage Δ
e2e	`42.19% <42.85%> (-0.02%)`	⬇️
experimental-e2e	`11.84% <23.80%> (-39.83%)`	⬇️
unit	`53.73% <0.00%> (-0.11%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Signed-off-by: grokspawn <jordan@nimblewidget.com>

Copilot

Pull request overview

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

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.

Copilot · 2026-03-12T20:37:40Z

+ return err
+ }
+	} else {
+ restConfig = ctrl.GetConfigOrDie()


run() now has two different failure behaviors for loading cluster config: the kubeconfig path returns an error, but the default path uses ctrl.GetConfigOrDie() which panics instead of returning an error. Since run() already returns error, prefer using a non-panicking config loader and propagate the error so startup failures are handled consistently.
Suggested change
restConfig=ctrl.GetConfigOrDie()
restConfig, err=ctrl.GetConfig()
iferr!=nil {
setupLog.Error(err, "unable to load in-cluster configuration")
returnerr
}

Copilot · 2026-03-12T20:37:41Z

+ return err
+ }
+	} else {
+ restConfig = ctrl.GetConfigOrDie()


Similar to operator-controller: the kubeconfig branch returns an error, but the default branch calls ctrl.GetConfigOrDie() which panics on failure. Since run() returns error, prefer consistently returning an error for config-load failures rather than panicking.
Suggested change
restConfig=ctrl.GetConfigOrDie()
restConfig, err=ctrl.GetConfig()
iferr!=nil {
setupLog.Error(err, "unable to load in-cluster kubeconfig")
returnerr
}

There is a point that GetConfigOrDie() is no longer necessary since it's not in the NewManager() call

On the other hand, it's established behavior if using the default path. While I can't foresee that someone would be expecting a panic outcome, it's been a precedent for a long time, and doesn't have to change here. Another alternative is even forcing a panic with an alternative kubeconfig, so that the branching behaviors align again.

tmshort · 2026-03-18T14:25:02Z

/approve

camilamacedo86

/lgtm

rashmigottipati

/lgtm

openshift-ci · 2026-03-19T12:15:34Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: camilamacedo86, 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:

~~cmd/OWNERS~~ [camilamacedo86,tmshort]

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

grokspawn · 2026-03-19T12:27:29Z

/override codecov/patch
/override codecov/project

these are not required jobs and should not prevent merging

openshift-ci · 2026-03-19T12:27:35Z

@grokspawn: Overrode contexts on behalf of grokspawn: codecov/patch, codecov/project

Details

In response to this:

/override codecov/patch
/override codecov/project
these are not required jobs and should not prevent merging

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.

This reverts commit 8ccea5a.

CopilotAI review requested due to automatic review settings March 12, 2026 20:06

openshift-ciBot requested review from OchiengEd and camilamacedo86 March 12, 2026 20:06

Copilotstarted reviewing on behalf of grokspawn March 12, 2026 20:07 View session

CopilotAI reviewed Mar 12, 2026
View reviewed changes

Comment threadcmd/operator-controller/main.go
Comment threadcmd/catalogd/main.go

grokspawn force-pushed the hypershift-adaptation branch from c3f5ed2 to 1d14a74Compare March 12, 2026 20:34

initial
d68417a
Signed-off-by: grokspawn <jordan@nimblewidget.com>

CopilotAI review requested due to automatic review settings March 12, 2026 20:34

grokspawn force-pushed the hypershift-adaptation branch from 1d14a74 to d68417aCompare March 12, 2026 20:34

Copilotstarted reviewing on behalf of grokspawn March 12, 2026 20:35 View session

CopilotAI reviewed Mar 12, 2026
View reviewed changes

grokspawn changed the title ~~✨ WIP: add support for receiving kubeconfig in op-con/catd options~~✨ add support for receiving kubeconfig in op-con/catd optionsMar 18, 2026

openshift-ciBot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 18, 2026

camilamacedo86 approved these changes Mar 19, 2026
View reviewed changes

openshift-ciBot assigned camilamacedo86 Mar 19, 2026

openshift-ciBot added the lgtm Indicates that a PR is ready to be merged. label Mar 19, 2026

rashmigottipati approved these changes Mar 19, 2026
View reviewed changes

openshift-ciBot assigned rashmigottipati Mar 19, 2026

openshift-merge-botBot merged commit 8ccea5a into operator-framework:mainMar 19, 2026
31 of 33 checks passed

grokspawn deleted the hypershift-adaptation branch March 19, 2026 12:31

grokspawn added a commit to grokspawn/operator-controller that referenced this pull request Apr 3, 2026
Revert "initial (operator-framework#2562)"
2dea37a
This reverts commit 8ccea5a.

grokspawn mentioned this pull request Apr 3, 2026
🌱 Revert "add support for --kubeconfig to operator-controller, catalogd" #2630
Merged
4 tasks

openshift-merge-botBot pushed a commit that referenced this pull request Apr 6, 2026
Revert "initial (#2562)" (#2630)
fd25bf7
This reverts commit 8ccea5a.

-restConfig=ctrl.GetConfigOrDie()
+restConfig, err=ctrl.GetConfig()
+iferr!=nil {
+setupLog.Error(err, "unable to load in-cluster configuration")
+returnerr
+ }

Uh oh!

Conversation

grokspawn commented Mar 12, 2026

Description

Reviewer Checklist

Uh oh!

netlifyBot commented Mar 12, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for olmv1 ready!

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

codecovBot commented Mar 12, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

CopilotAIMar 12, 2026

Choose a reason for hiding this comment

Uh oh!

CopilotAIMar 12, 2026

Choose a reason for hiding this comment

Uh oh!

tmshortMar 12, 2026

Choose a reason for hiding this comment

Uh oh!

grokspawnMar 13, 2026

Choose a reason for hiding this comment

Uh oh!

tmshort commented Mar 18, 2026

Uh oh!

camilamacedo86 left a comment

Choose a reason for hiding this comment

Uh oh!

rashmigottipati left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ciBot commented Mar 19, 2026

Uh oh!

grokspawn commented Mar 19, 2026

Uh oh!

openshift-ciBot commented Mar 19, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

netlifyBot commented Mar 12, 2026•
edited
Loading

codecovBot commented Mar 12, 2026•
edited
Loading