-
Notifications
You must be signed in to change notification settings - Fork 569
fix: add OpenAPIModelName for PackageManifest to fix oc explain #3755
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
Merged
openshift-merge-bot
merged 1 commit into
operator-framework:master
from
jianzhangbjz:schema
Feb 4, 2026
+152
−120
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| Copyright Red Hat, Inc. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package v1 | ||
|
|
||
| // OpenAPIModelName returns the OpenAPI model name for this type. | ||
| // This is used by openapi-gen to register the GVK extension. | ||
| // The format matches what k8s.io/apimachinery/pkg/runtime.Scheme.ToOpenAPIDefinitionName would generate. | ||
| func (PackageManifest) OpenAPIModelName() string { | ||
| return "com.github.operator-framework.operator-lifecycle-manager.pkg.package-server.apis.operators.v1.PackageManifest" | ||
| } | ||
|
|
||
| // OpenAPIModelName returns the OpenAPI model name for this type. | ||
| // This is used by openapi-gen to register the GVK extension. | ||
| // The format matches what k8s.io/apimachinery/pkg/runtime.Scheme.ToOpenAPIDefinitionName would generate. | ||
| func (PackageManifestList) OpenAPIModelName() string { | ||
| return "com.github.operator-framework.operator-lifecycle-manager.pkg.package-server.apis.operators.v1.PackageManifestList" | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a reason this is only done for these two resources? I see k8s now has functions as well, with similar returns, but many of our types are still using the domain/path model, rather than the reverse.domain.path model
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good question! The reason this is only done for
PackageManifestandPackageManifestListis that these are the only resources served by the package-server aggregated API, rather than being actual CRDs. All other OLM types (Subscription, ClusterServiceVersion, CatalogSource, etc.) are true CRDs underoperators.coreos.com. For CRDs, Kubernetes automatically handles the OpenAPI schema generation and adds thex-kubernetes-group-version-kindextension through its CRD controller.Regarding the
reverse.domain.pathformat (com.github.operator-framework...) - this matches whatk8s.io/apimachinery/pkg/runtime.Scheme.ToOpenAPIDefinitionName()generates, which is required for the name lookup to succeed. The other OLM types don't need this because the CRD mechanism handles it automatically.After upgrading to
kube-openapi v0.0.0-20250910181357in PR #3707, the mix of types with and withoutOpenAPIModelName()caused the model name lookup to fail forPackageManifest, preventing the GVK extension from being added to its OpenAPI schema.