Skip to content

featuregate for catalogd metas web api #2202

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
Merged
merged 2 commits into from
Feb 20, 2025
Merged

featuregate for catalogd metas web api #2202

merged 2 commits into from
Feb 20, 2025

Conversation

grokspawn
Copy link
Contributor

No description provided.

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Feb 12, 2025

Hello @grokspawn! Some important instructions when contributing to openshift/api:
API design plays an important part in the user experience of OpenShift and as such API PRs are subject to a high level of scrutiny to ensure they follow our best practices. If you haven't already done so, please review the OpenShift API Conventions and ensure that your proposed changes are compliant. Following these conventions will help expedite the api review process for your PR.

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 12, 2025
@grokspawn grokspawn force-pushed the catalogd-metasapi-feature branch from 47b1d07 to 9628bae Compare February 12, 2025 22:06
JoelSpeed
JoelSpeed reviewed Feb 14, 2025
View reviewed changes
features/features.go
contactPerson("jordank").
productScope(ocpSpecific).
enhancementPR("https://github.com/openshift/enhancements/pull/1749").
enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
Copy link
Contributor

Choose a reason for hiding this comment

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

This is deliberately not being enabled for HyperShift clusters?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, I think this is just where I'm uncertain about how to go about this. There are Hypershift and SelfManaged options, and I need the latter, but it's unclear how to also enable the former.

Do I list the feature twice (once for each)? Is Hypershift a superset of SelfManaged?

Without some feedback from SNO reviewers I don't think we want this landing as a surprise there, but otherwise this feature should be everywhere else.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ooh. Having played with it a bit, it appears that Hypershift is a superset of SelfManaged, so I /think/ I've fixed it.

Copy link
Member

Choose a reason for hiding this comment

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

NewOLM is not enabled on Hypershift (yet), therefore any new subfeature of NewOLM (like this one) should also not be enabled on hypershift.

@grokspawn grokspawn force-pushed the catalogd-metasapi-feature branch from 9628bae to de712d2 Compare February 14, 2025 15:58
@openshift-ci openshift-ci bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 14, 2025
@grokspawn grokspawn force-pushed the catalogd-metasapi-feature branch from de712d2 to 5c3885a Compare February 14, 2025 16:46
@grokspawn
Copy link
Contributor Author

Didn't see anything in the CI failures that looked actionable, and was able to bring up a cluster with this PR merged, so I'm calling this 'infra' and re-kicking.

/retest

joelanford
joelanford reviewed Feb 17, 2025
View reviewed changes
features/features.go Outdated
@@ -522,6 +522,14 @@ var (
enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default).
mustRegister()

FeatureGateNewOLMCatalogdMetas = newFeatureGate("NewOLMCatalogdMetas").
Copy link
Member

Choose a reason for hiding this comment

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

Should we include APIV1 in the name in case there is ever an /api/v2/metas endpoint behind a different feature gate?

Suggested change
FeatureGateNewOLMCatalogdMetas = newFeatureGate("NewOLMCatalogdMetas").
FeatureGateNewOLMCatalogdMetas = newFeatureGate("NewOLMCatalogdAPIV1Metas").

joelanford
joelanford reviewed Feb 17, 2025
View reviewed changes
features/features.go Outdated
contactPerson("jordank").
productScope(ocpSpecific).
enhancementPR("https://github.com/openshift/enhancements/pull/1749").
enableForClusterProfile(Hypershift, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
Copy link
Member

@joelanford joelanford Feb 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

As I mentioned in another thread, NewOLM (the parent feature for OLMv1) is not yet enabled in Hypershift. This feature gate needs to align with NewOLM.

Suggested change
enableForClusterProfile(Hypershift, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 18, 2025
JoelSpeed
JoelSpeed reviewed Feb 18, 2025
View reviewed changes
features/features.go
contactPerson("jordank").
productScope(ocpSpecific).
enhancementPR("https://github.com/openshift/enhancements/pull/1749").
enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
Copy link
Contributor

Choose a reason for hiding this comment

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

I think you just want to enable everywhere and not make a distinction between cluster profiles

Suggested change
enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).

Copy link
Contributor Author

@grokspawn grokspawn Feb 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

That would enable us for hypershift, and the new feature flag can't be enable there because its "parent" NewOLM cannot be enabled there yet.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ack, in which case you have it correct already!

@JoelSpeed
Copy link
Contributor

/approve

Will let @joelanford add the LGTM if he is happy with the name

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 18, 2025
@grokspawn
featuregate for catalogd metas web api
d0f74a9 
Signed-off-by: Jordan Keister <jordan@nimblewidget.com>
@grokspawn
review resolution
cedb085 
Signed-off-by: Jordan Keister <jordan@nimblewidget.com>
@grokspawn grokspawn force-pushed the catalogd-metasapi-feature branch from 9b88560 to cedb085 Compare February 18, 2025 21:35
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 18, 2025
@joelanford
Copy link
Member

/lgtm

Thanks for the review @JoelSpeed !

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

openshift-ci bot commented Feb 18, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: grokspawn, joelanford, JoelSpeed

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

The pull request process is described 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

@grokspawn
Copy link
Contributor Author

/retest-required

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD ead8ee7 and 2 for PR HEAD cedb085 in total

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Feb 20, 2025

@grokspawn: all tests passed!

Full PR test history. Your PR dashboard.

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.

@openshift-merge-bot openshift-merge-bot bot merged commit cfbda0b into openshift:master Feb 20, 2025
22 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-cluster-config-api
This PR has been included in build ose-cluster-config-api-container-v4.19.0-202502200538.p0.gcfbda0b.assembly.stream.el9.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joelanford joelanford joelanford left review comments

@JoelSpeed JoelSpeed JoelSpeed left review comments

@derekwaynecarr derekwaynecarr Awaiting requested review from derekwaynecarr

@knobunc knobunc Awaiting requested review from knobunc

Assignees

@joelanford joelanford

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@grokspawn @JoelSpeed @joelanford @openshift-ci-robot @openshift-bot @openshift-merge-robot