[Backport release-2.3] render: Sync render.proto with c/c and wire XRD through#78
Merged
Merged
Conversation
Add composite_resource_definition (field 8) to CompositeInput, matching the upstream change in crossplane/crossplane. The field carries the XRD that defines the input XR so the render binary can pick the right composite.Schema (Legacy vs Modern) the way the production reconciler does. The field is optional, so existing callers keep their current SchemaModern fallback behavior. The cli's option go_package intentionally still points at github.com/crossplane/cli/v2/proto/render/v1alpha1, not the upstream path. Regenerated render.pb.go via ./nix.sh run .#generate using the Nix-pinned protoc-gen-go v1.36.10. Upstream: crossplane/crossplane@12f3f1c Upstream follow-up: crossplane/crossplane@babb251 Signed-off-by: Jonathan Ogilvie <jonathan.ogilvie@sumologic.com> (cherry picked from commit ab6d7d9)
Add XRD field to CompositionInputs so callers can pass a CompositeResourceDefinition to the render binary. BuildCompositeRequest copies it through to the proto's CompositeResourceDefinition field (added in the previous commit syncing render.proto). When no XRD is supplied behavior is unchanged (Schema=Modern fallback in the binary). Mirror of the Go-level change in crossplane/crossplane/cmd/crossplane/render to keep the CLI's CompositionInputs in sync with what the binary now consumes. Signed-off-by: Jonathan Ogilvie <jonathan.ogilvie@sumologic.com> (cherry picked from commit 2b12209)
github-actions
Bot
requested review from
a team,
jcogilvie and
tampakrap
as code owners
5 tasks
adamwg
approved these changes
Jun 4, 2026
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
2 participants
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.
Description
Backport of #74 to
release-2.3.