Skip to content
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

OSDOCS#6669: Add OLM 1.0 arch/components #65963

Merged
merged 1 commit into from
Oct 26, 2023
Merged

Conversation

adellape
Copy link
Contributor

@adellape adellape commented Oct 9, 2023

https://issues.redhat.com/browse/OSDOCS-6669

OCP 4.14

Preview: https://65963--docspreview.netlify.app/openshift-enterprise/latest/operators/olm_v1/arch/olmv1-components.html

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 9, 2023
@adellape adellape force-pushed the arch_olmv1 branch 3 times, most recently from 511aecf to 4f09cc3 Compare October 9, 2023 19:59
@adellape adellape changed the title Add OLMv1 dir and plain+v0 assembly Add OLM 1.0 arch/components Oct 9, 2023
@adellape adellape force-pushed the arch_olmv1 branch 2 times, most recently from 0676406 to 2a09c41 Compare October 9, 2023 20:28
@adellape adellape added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 9, 2023
@adellape adellape added this to the Planned for 4.14 GA milestone Oct 9, 2023
@adellape adellape changed the title Add OLM 1.0 arch/components OSDOCS#6669: Add OLM 1.0 arch/components Oct 9, 2023
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 9, 2023
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Oct 9, 2023

🤖 Updated build preview is available at:
https://65963--docspreview.netlify.app

Build log: https://circleci.com/gh/ocpdocs-previewbot/openshift-docs/30420

@adellape adellape changed the title OSDOCS#6669: Add OLM 1.0 arch/components [WIP] OSDOCS#6669: Add OLM 1.0 arch/components Oct 10, 2023
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 10, 2023
@adellape adellape force-pushed the arch_olmv1 branch 4 times, most recently from 4ccd705 to 72fced4 Compare October 10, 2023 20:04
@openshift-ci openshift-ci bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 10, 2023
@adellape adellape force-pushed the arch_olmv1 branch 5 times, most recently from 72cc804 to b938783 Compare October 18, 2023 14:06
@adellape adellape force-pushed the arch_olmv1 branch 9 times, most recently from 62e0ebb to 545ebf9 Compare October 23, 2023 01:45
@adellape adellape added the peer-review-needed Signifies that the peer review team needs to review this PR label Oct 23, 2023
"name": "example-extension",
"defaultChannel": "preview"
}
{

Choose a reason for hiding this comment

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

Lack of the ---- between each JSON section.

Copy link
Contributor Author

@adellape adellape Oct 24, 2023

Choose a reason for hiding this comment

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

I can't get opm validate to validate with ---- in the file, unless you are referring to breaking up each section into separate AsciiDoc ---- code blocks. However, opm validate does pass the full index.json file as is (all JSON sections together with no separations).

}
]
}
{

Choose a reason for hiding this comment

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

Same, here lack of the ---- between each JSON section.

@jianzhangbjz
Copy link

Others /lgtm

@skrthomas skrthomas added peer-review-in-progress Signifies that the peer review team is reviewing this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Oct 23, 2023
Copy link
Contributor

@skrthomas skrthomas left a comment

Choose a reason for hiding this comment

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

Really snazzy! A few suggestions for you but overall lookin good :)

operators/olm_v1/arch/olmv1-operator-controller.adoc Outdated Show resolved Hide resolved
snippets/olmv1-operator-api-group.adoc Outdated Show resolved Hide resolved
@skrthomas skrthomas added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR labels Oct 23, 2023
"version": "v0.0.1"
"version": "0.0.1"
Copy link
Contributor Author

@adellape adellape Oct 24, 2023

Choose a reason for hiding this comment

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

Had to drop the v here because it was failing validation:

$ opm validate plainbundlecatalog  

FATA[0000] error parsing bundle "example-extension.v0.0.1" version "v0.0.1": Invalid character(s) found in major number "v0" 

Seems possibly related to operator-framework/operator-registry#932. Running:

$ opm version

Version: version.Version{OpmVersion:"v1.30.0-2-gb1374806", GitCommit:"b1374806", BuildDate:"2023-10-24T14:02:39Z", GoOs:"darwin", GoArch:"arm64"}

@openshift-ci openshift-ci bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Oct 26, 2023
@adellape adellape merged commit a61ddf3 into openshift:main Oct 26, 2023
1 check passed
@adellape adellape deleted the arch_olmv1 branch October 26, 2023 18:58
@adellape
Copy link
Contributor Author

/cherrypick enterprise-4.14

@openshift-cherrypick-robot

@adellape: #65963 failed to apply on top of branch "enterprise-4.14":

Applying: Add OLM 1.0 arch/components
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
M	_topic_maps/_topic_map.yml
Falling back to patching base and 3-way merge...
Removing operators/olm_v1/olmv1-packaging-format.adoc
Removing operators/olm_v1/olmv1-managing-catalogs.adoc
Removing modules/olmv1-catalog-plain.adoc
Auto-merging _topic_maps/_topic_map.yml
Auto-merging _attributes/common-attributes.adoc
CONFLICT (content): Merge conflict in _attributes/common-attributes.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add OLM 1.0 arch/components
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.14

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/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.14 peer-review-done Signifies that the peer review team has reviewed this PR size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants