Skip to content

🌱 OPRUN-4077: Remove the kustomize config #2213

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

🌱 OPRUN-4077: Remove the kustomize config #2213

wants to merge 3 commits into from

Conversation

tmshort
Copy link
Contributor

@tmshort tmshort commented Sep 11, 2025

Add a helm/OWNERS file (copied from config/OWNERS) Update hack/tools/update-crds.sh to not reference config directory

Description

Reviewer Checklist

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

@tmshort tmshort requested a review from a team as a code owner September 11, 2025 19:18
@netlify Netlify
Copy link

netlify bot commented Sep 11, 2025 •
edited
Loading

✅ Deploy Preview for olmv1 ready!

Name Link
🔨 Latest commit 44e0acf
🔍 Latest deploy log https://app.netlify.com/projects/olmv1/deploys/68cd69d82694dd00080defb9
😎 Deploy Preview https://deploy-preview-2213--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-ci bot requested review from anik120 and oceanc80 September 11, 2025 19:18
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Sep 11, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

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

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

@tmshort
Copy link
Contributor Author

tmshort commented Sep 11, 2025

/hold
This will seriously break the downstream bumper, because the manifest source will have changed, and the code to handle the new config is in a late carry commit. This might trigger us to consolidate all the carry commits (something that we acknowledge we have to do occasionally).

@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 Sep 11, 2025
@codecov Codecov
Copy link

codecov bot commented Sep 11, 2025 •
edited
Loading

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 72.05%. Comparing base (8fafb65) to head (44e0acf).
⚠️ Report is 3 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #2213      +/-   ##
==========================================
- Coverage   72.20%   72.05%   -0.16%     
==========================================
  Files          85       85              
  Lines        8405     8405              
==========================================
- Hits         6069     6056      -13     
- Misses       1937     1948      +11     
- Partials      399      401       +2
Flag Coverage Δ
e2e 39.21% <ø> (-0.04%) ⬇️
experimental-e2e 46.00% <ø> (-0.21%) ⬇️
unit 57.00% <ø> (+0.01%) ⬆️

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.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 19, 2025
camilamacedo86
camilamacedo86 reviewed Sep 19, 2025
View reviewed changes
Makefile
CRD_DIFF_OPCON_SOURCE := config/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml
CRD_DIFF_CATD_SOURCE := config/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml
CRD_DIFF_OPCON_SOURCE := helm/olmv1/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml
CRD_DIFF_CATD_SOURCE := helm/olmv1/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml
Copy link
Contributor

Choose a reason for hiding this comment

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

Why do we actually need the base?
It feels more like a kustomize-style layout.

Since everything is already managed under Helm, why wouldn’t those manifests live under templates instead?
Also, I noticed we have CRDs under templates — shouldn’t this be consistent?

@tmshort
Remove the kustomize config
69760fb 
Add a helm/OWNERS file (copied from config/OWNERS)
Update hack/tools/update-crds.sh to not reference config directory

Signed-off-by: Todd Short <tshort@redhat.com>
@tmshort
Fixup unit test config paths
2a27849 
Signed-off-by: Todd Short <tshort@redhat.com>
@tmshort
Update CRD locations for crd-diff
44e0acf 
Signed-off-by: Todd Short <tshort@redhat.com>
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@camilamacedo86 camilamacedo86 camilamacedo86 left review comments

@anik120 anik120 Awaiting requested review from anik120

@oceanc80 oceanc80 Awaiting requested review from oceanc80

Assignees
No one assigned
Labels
do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tmshort @camilamacedo86 @openshift-merge-robot