Fix ParseSchemaV3 to handle allOf-wrapped $ref#584
Open
bryantbiggs wants to merge 1 commit intokubernetes:masterfrom
Open
Fix ParseSchemaV3 to handle allOf-wrapped $ref#584bryantbiggs wants to merge 1 commit intokubernetes:masterfrom
bryantbiggs wants to merge 1 commit intokubernetes:masterfrom
Conversation
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: bryantbiggs The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
This was referenced Mar 17, 2026
Jefftree
reviewed
Mar 18, 2026
Member
|
Please fix the commit message. assuming it has to do with symbols being used. |
When a schema has no type but a single-element allOf containing a ref, resolve it as a reference instead of falling through to Arbitrary. Build the Ref from the outer schema so sibling fields like description, default, and extensions are preserved.
4dc8abd to
bafd5e9
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
ParseSchemaV3indocument_v3.goto handle theallOf-wrapped$refpatternallOfcontaining a$ref, resolve it as a reference instead of falling through toArbitraryContext
In OpenAPI 3.0, sibling properties alongside
$refmust be ignored per the spec. The compliant way to combine$refwithdescription/defaultis to wrap the$refin a single-elementallOf:kube-openapi's own builder (
builder3/util.WrapRefs) produces this format, and Kubernetes >= 1.35 serves v3 specs using it. However,ParseSchemaV3had zero handling forallOf— these schemas fell through to the default case and were returned asArbitrary, losing the reference.This matches the pattern already used in
pkg/schemaconv/openapi.go:130-133.Fixes #477
Unblocks #583
Test plan
TestV3AllOfRef— verifies both direct$refandallOf-wrapped$refresolve asproto.Referencego vetclean