Repository navigation
generate: keep owned CRD order from the base CSV - #7148
Open
RaphaelFakhri wants to merge 1 commit into
Open
RaphaelFakhri wants to merge 1 commit into
RaphaelFakhri wants to merge 1 commit into
Conversation
applyCustomResourceDefinitions rebuilt spec.customresourcedefinitions.owned in the order the CRD manifests were collected, so the order set in the base CSV by the customresourcedefinitions order marker (or by hand) was lost in the bundle CSV. Keep existing descriptions in their base order, drop those whose CRD is no longer present, and append new CRDs in collector order. Closes operator-framework#6771 Signed-off-by: Raphael Fakhri <153192858+RaphaelFakhri@users.noreply.github.com>
This branch has not been deployed
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.
Description of the change:
applyCustomResourceDefinitionsrebuiltspec.customresourcedefinitions.ownedin the order the CRD manifests were collected. This change keeps descriptions already in the base CSV in their existing order, drops descriptions whose CRD is no longer present, and appends descriptions for new CRDs in collector order.A new unit test covers the ordering, the removal of stale entries, and the appending of new CRDs.
Motivation for the change:
The
+operator-sdk:csv:customresourcedefinitions:ordermarker reordersownedinconfig/manifests/bases/*.clusterserviceversion.yaml, butmake bundlereordered the list again by CRD manifest order (effectively alphabetical afterkustomize build). The bundle CSV ignored both the marker and any manual ordering, and OperatorHub and the OpenShift console use this order to display CRDs.Closes #6771
Checklist
If the pull request includes user-facing changes, extra documentation is required:
changelog/fragments(seechangelog/fragments/00-template.yaml)website/content/en/docs(not needed: the marker reference already documents this behavior)