Skip to content

🌱 Moving code from catalogd/internal to internal/catalogd #1746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conversation

LalatenduMohanty
Copy link
Member

@LalatenduMohanty LalatenduMohanty commented Feb 11, 2025

This partially fixes #1707. The intent is to consolidate internal code from operator-controller and catalogd within internal.
This PR does not move catalogd/internal/controllers and
catalogd/internal/webhook as it need explict changes in both op-con and
catalogd Makefile. Which we will do in a followup PR.

catalogd/ - code specific to catalogd
internal/ - holds internal code of catalogd and operator-controller.
internal/catalogd - holds unexported code specific to catalogd
internal/operator-controller - holds unexported code specific to operator-comntroller
internal/shared - shared code between catalogd and operator-controller which can not be exported outside.

Description

Reviewer Checklist

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

@LalatenduMohanty LalatenduMohanty requested a review from a team as a code owner February 11, 2025 19:40
Copy link

netlify bot commented Feb 11, 2025

Deploy Preview for olmv1 ready!

Name Link
🔨 Latest commit 101535e
🔍 Latest deploy log https://app.netlify.com/sites/olmv1/deploys/67ac094b2b7d360008f4c115
😎 Deploy Preview https://deploy-preview-1746--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 site configuration.

@LalatenduMohanty LalatenduMohanty changed the title 🌱 [WIP] Moving code from catalogd/internal to internal/catalogd 🌱 Moving code from catalogd/internal to internal/catalogd Feb 11, 2025
camilamacedo86
camilamacedo86 previously approved these changes Feb 11, 2025
Copy link
Contributor

@camilamacedo86 camilamacedo86 left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 11, 2025
Copy link

codecov bot commented Feb 11, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.34%. Comparing base (81f0cfd) to head (101535e).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1746   +/-   ##
=======================================
  Coverage   67.34%   67.34%           
=======================================
  Files          61       61           
  Lines        5236     5236           
=======================================
  Hits         3526     3526           
  Misses       1449     1449           
  Partials      261      261           
Flag Coverage Δ
e2e 52.19% <ø> (ø)
unit 55.00% <ø> (ø)

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.

@LalatenduMohanty LalatenduMohanty added this pull request to the merge queue Feb 11, 2025
@joelanford joelanford removed this pull request from the merge queue due to a manual request Feb 11, 2025
Copy link
Member

@joelanford joelanford left a comment

Choose a reason for hiding this comment

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

Let's hold on merging until we get consensus on what's happening with the RBAC changes.

@LalatenduMohanty
Copy link
Member Author

/hold looks like we are not generating catalogd manifests with this change

$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/base/crd/bases output:rbac:artifacts:config=config/base/rbac output:webhook:artifacts:config=config/base/manager/webhook/

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 11, 2025
@LalatenduMohanty LalatenduMohanty force-pushed the catalogd_internal_issue_1707 branch from e6b4d3a to 14ebe86 Compare February 11, 2025 21:45
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 11, 2025
@LalatenduMohanty LalatenduMohanty force-pushed the catalogd_internal_issue_1707 branch 2 times, most recently from fbfd13f to 0e34fae Compare February 12, 2025 02:30
@LalatenduMohanty
Copy link
Member Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 12, 2025
This partially fixes operator-framework#1707. The intent is to consolidate internal code from operator-controller and catalogd within internal.
This PR does not move catalogd/internal/controllers and
catalogd/internal/webhook as it need explict changes in both op-con and
catalogd Makefile. Which we will do in a followup PR.

    catalogd/ - code specific to catalogd
    internal/ - holds internal code of catalogd and operator-controller.
    internal/catalogd - holds unexported code specific to catalogd
    internal/operator-controller - holds unexported code specific to operator-comntroller
    internal/shared - shared code between catalogd and operator-controller which can not be exported outside.

Signed-off-by: Lalatendu Mohanty <[email protected]>
@LalatenduMohanty LalatenduMohanty force-pushed the catalogd_internal_issue_1707 branch from 0e34fae to 101535e Compare February 12, 2025 02:36
Copy link
Contributor

@camilamacedo86 camilamacedo86 left a comment

Choose a reason for hiding this comment

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

The request changed by @joelanford is done now
It is passing in the CI and it is as we agreed upon
So,

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 12, 2025
@joelanford joelanford added this pull request to the merge queue Feb 12, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Feb 12, 2025
@LalatenduMohanty LalatenduMohanty added this pull request to the merge queue Feb 12, 2025
Merged via the queue into operator-framework:main with commit b53c31c Feb 12, 2025
23 checks passed
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.

Consolidate code from catalogd/internal in to operator-controller/internal
3 participants