Skip to content

🌱 Revert "add support for --kubeconfig to operator-controller, catalogd" - #2630

Merged
openshift-merge-bot[bot] merged 1 commit into
operator-framework:mainfrom
grokspawn:revert-2562
Apr 6, 2026
Merged

🌱 Revert "add support for --kubeconfig to operator-controller, catalogd"#2630
openshift-merge-bot[bot] merged 1 commit into
operator-framework:mainfrom
grokspawn:revert-2562

Conversation

@grokspawn

@grokspawngrokspawn commented Apr 3, 2026

Copy link
Copy Markdown
Contributor

This reverts commit 8ccea5a.

Description

This PR reverts #2562. While it seemed that it was necessary, it turns out that controller-runtime already supports --kubeconfig, and to override that support we would have to invoke RegisterFlags (which 2562 did not do).

Since support was already there, and overriding that support was incomplete, we'll just revert the PR in its entirety.

Reviewer Checklist

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

CopilotAI review requested due to automatic review settings April 3, 2026 18:48
@netlify

netlifyBot commented Apr 3, 2026

Copy link
Copy Markdown

Deploy Preview for olmv1 ready!

NameLink
🔨 Latest commit2dea37a
🔍 Latest deploy loghttps://app.netlify.com/projects/olmv1/deploys/69d00b7ed29bf100081cedb0
😎 Deploy Previewhttps://deploy-preview-2630--olmv1.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

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

@openshift-ci
openshift-ciBot requested review from dtfranz and pedjakApril 3, 2026 18:48
@grokspawngrokspawn changed the title 🌱 Revert "add support for --kubeconfig to operator-controller, catalogd" (#2562)"🌱 Revert "add support for --kubeconfig to operator-controller, catalogd"Apr 3, 2026

CopilotAI 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

Reverts the previously added explicit --kubeconfig plumbing in operator-controller and catalogd, returning both binaries to using controller-runtime’s default Kubernetes client configuration loading.

Changes:

  • Removed the custom --kubeconfig flag and associated config field from both binaries.
  • Removed manual kubeconfig loading via clientcmd.BuildConfigFromFlags and reverted to ctrl.GetConfigOrDie() for REST config creation.
  • Cleaned up now-unused client-go/rest and clientcmd imports.

Reviewed changes

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

FileDescription
cmd/operator-controller/main.goDrops custom kubeconfig flag/loader and uses controller-runtime default config resolution.
cmd/catalogd/main.goDrops custom kubeconfig flag/loader and uses controller-runtime default config resolution.

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

@codecov

codecovBot commented Apr 3, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 68.99%. Comparing base (5060cae) to head (2dea37a).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@ Coverage Diff @@## main #2630 +/- ##
==========================================
+ Coverage 68.89% 68.99% +0.10% 
==========================================
Files 139 139 Lines 9910 9891 -19 ==========================================
- Hits 6827 6824 -3 + Misses 2572 2560 -12 + Partials 511 507 -4 
FlagCoverage Δ
e2e37.53% <100.00%> (-0.07%)⬇️
experimental-e2e52.28% <100.00%> (+0.05%)⬆️
unit53.59% <0.00%> (+0.09%)⬆️

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.

@dtfranz

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ciopenshift-ciBot added the lgtm Indicates that a PR is ready to be merged. label Apr 6, 2026

@rashmigottipatirashmigottipati left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/lgtm

@tmshort

Copy link
Copy Markdown
Contributor

/approve

@openshift-ci

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@openshift-ciopenshift-ciBot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 6, 2026
@openshift-merge-bot
openshift-merge-botBot merged commit fd25bf7 into operator-framework:mainApr 6, 2026
30 of 32 checks passed
@grokspawn
grokspawn deleted the revert-2562 branch April 7, 2026 13:56
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approvedIndicates a PR has been approved by an approver from all required OWNERS files.lgtmIndicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@grokspawn@dtfranz@tmshort@rashmigottipati