Skip to content

OSDOCS-15793: modularizes Operators assemblies MicroShift #101777

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Nov 6, 2025
Merged

OSDOCS-15793: modularizes Operators assemblies MicroShift #101777

merged 1 commit into from
Nov 6, 2025

Conversation

@ShaunaDiaz
Copy link
Contributor

@ShaunaDiaz ShaunaDiaz commented Nov 5, 2025 •
edited
Loading

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 5, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 5, 2025 •
edited by openshift-ci bot
Loading

@ShaunaDiaz: This pull request references OSDOCS-15793 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

Version(s):
4.16+

Issue:
OSDOCS-15793

Link to docs preview:

QE review:

  • N/A no technical content changes

Additional information:
Bare minimum structural changes for DITA conversion. Content changes/full CQA 2.0 is not in scope for this PR.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 5, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Nov 5, 2025 •
edited
Loading

🤖 Thu Nov 06 14:48:46 - Prow CI generated the docs preview:

https://101777--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift_operators/microshift-operators.html
https://101777--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror-disconnected.html
https://101777--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror.html
https://101777--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift_operators/microshift-operators-olm.html

ocpdocs-vale-bot
ocpdocs-vale-bot reviewed Nov 5, 2025
View reviewed changes
ocpdocs-vale-bot
ocpdocs-vale-bot reviewed Nov 5, 2025
View reviewed changes
ocpdocs-vale-bot
ocpdocs-vale-bot reviewed Nov 5, 2025
View reviewed changes
ocpdocs-vale-bot
ocpdocs-vale-bot reviewed Nov 5, 2025
View reviewed changes
ocpdocs-vale-bot
ocpdocs-vale-bot reviewed Nov 5, 2025
View reviewed changes
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 5, 2025 •
edited by openshift-ci bot
Loading

@ShaunaDiaz: This pull request references OSDOCS-15793 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target either version "4.21." or "openshift-4.21.", but it targets "aem-migration" instead.

In response to this:

Version(s):
4.16+

Issue:
OSDOCS-15793

Link to docs preview:
https://101777--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift_operators/microshift-operators.html
https://101777--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror-disconnected.html
https://101777--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror.html
https://101777--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift_operators/microshift-operators-olm.html

QE review:

  • N/A no technical content changes

Additional information:
Bare minimum structural changes for DITA conversion. Content changes/full CQA 2.0 is not in scope for this PR.

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 openshift-eng/jira-lifecycle-plugin repository.

@ShaunaDiaz ShaunaDiaz force-pushed the OSDOCS-15793 branch 4 times, most recently from 65f8694 to 1a2f7f0 Compare November 5, 2025 19:18
@ShaunaDiaz ShaunaDiaz added the merge-review-needed Signifies that the merge review team needs to review this PR label Nov 5, 2025
michaelryanpeter
michaelryanpeter reviewed Nov 5, 2025
View reviewed changes
Copy link
Contributor

@michaelryanpeter michaelryanpeter left a comment

Choose a reason for hiding this comment

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

I left some nits.

@snarayan-redhat snarayan-redhat added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Nov 6, 2025
@snarayan-redhat
Copy link
Contributor

snarayan-redhat commented Nov 6, 2025

I left some nits.

This was still shown in review queue since it has the merge-review-needed label. I am adding the merge-review-in-progress label to get it off queue for now. Feel free to add/remove any appropriate labels as required.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 6, 2025
@ShaunaDiaz ShaunaDiaz removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Nov 6, 2025
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 6, 2025
@openshift-ci
Copy link

openshift-ci bot commented Nov 6, 2025

@ShaunaDiaz: all tests passed!

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

@ShaunaDiaz ShaunaDiaz merged commit ad9965a into openshift:main Nov 6, 2025
2 checks passed
@ShaunaDiaz
Copy link
Contributor Author

ShaunaDiaz commented Nov 6, 2025

/cherrypick enterprise-4.21

@ShaunaDiaz
Copy link
Contributor Author

ShaunaDiaz commented Nov 6, 2025

/cherrypick enterprise-4.20

@ShaunaDiaz
Copy link
Contributor Author

ShaunaDiaz commented Nov 6, 2025

/cherrypick enterprise-4.19

@ShaunaDiaz
Copy link
Contributor Author

ShaunaDiaz commented Nov 6, 2025

/cherrypick enterprise-4.18

@ShaunaDiaz
Copy link
Contributor Author

ShaunaDiaz commented Nov 6, 2025

/cherrypick enterprise-4.17

@ShaunaDiaz
Copy link
Contributor Author

ShaunaDiaz commented Nov 6, 2025

/cherrypick enterprise-4.16

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Nov 6, 2025

@ShaunaDiaz: new pull request created: #101902

In response to this:

/cherrypick enterprise-4.21

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-sigs/prow repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Nov 6, 2025
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Nov 6, 2025

@ShaunaDiaz: new pull request created: #101903

In response to this:

/cherrypick enterprise-4.20

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-sigs/prow repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Nov 6, 2025
Merged
@openshift-cherrypick-robot

This comment was marked as resolved.

Sign in to view
@openshift-cherrypick-robot

This comment was marked as resolved.

Sign in to view
@openshift-cherrypick-robot

This comment was marked as resolved.

Sign in to view
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Nov 6, 2025

@ShaunaDiaz: #101777 failed to apply on top of branch "enterprise-4.16":

Applying: OSDOCS-15793: modularizes Operators assemblies MicroShift
Using index info to reconstruct a base tree...
M	microshift_running_apps/microshift_operators/microshift-operators-oc-mirror-disconnected.adoc
M	microshift_running_apps/microshift_operators/microshift-operators-oc-mirror.adoc
M	microshift_running_apps/microshift_operators/microshift-operators-olm.adoc
M	modules/microshift-oc-mirror-about-con.adoc
A	modules/microshift-oc-mirror-connectivity.adoc
M	modules/microshift-oc-mirror-creating-imageset-config.adoc
A	modules/microshift-oc-mirror-dry-run.adoc
M	modules/microshift-oc-mirror-embed-ops-disconnected-use.adoc
M	modules/microshift-oc-mirror-install-catalog-node.adoc
M	modules/microshift-oc-mirror-list-ops-catalogs.adoc
A	modules/microshift-oc-mirror-to-mirror.adoc
M	modules/microshift-oc-mirror-transform-imageset-to-crio.adoc
M	modules/microshift-olm-build-op-catalogs.adoc
M	modules/microshift-olm-deploy-ops-global-ns.adoc
M	modules/microshift-olm-deploy-ops-spec-ns.adoc
A	modules/microshift-olm-rh-ops-mirror.adoc
M	modules/microshift-ops-config-embed-ostree.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/microshift-ops-config-embed-ostree.adoc
CONFLICT (modify/delete): modules/microshift-olm-rh-ops-mirror.adoc deleted in HEAD and modified in OSDOCS-15793: modularizes Operators assemblies MicroShift. Version OSDOCS-15793: modularizes Operators assemblies MicroShift of modules/microshift-olm-rh-ops-mirror.adoc left in tree.
Auto-merging modules/microshift-olm-deploy-ops-spec-ns.adoc
Auto-merging modules/microshift-olm-deploy-ops-global-ns.adoc
CONFLICT (content): Merge conflict in modules/microshift-olm-deploy-ops-global-ns.adoc
Auto-merging modules/microshift-olm-build-op-catalogs.adoc
CONFLICT (content): Merge conflict in modules/microshift-olm-build-op-catalogs.adoc
Auto-merging modules/microshift-oc-mirror-transform-imageset-to-crio.adoc
CONFLICT (content): Merge conflict in modules/microshift-oc-mirror-transform-imageset-to-crio.adoc
CONFLICT (modify/delete): modules/microshift-oc-mirror-to-mirror.adoc deleted in HEAD and modified in OSDOCS-15793: modularizes Operators assemblies MicroShift. Version OSDOCS-15793: modularizes Operators assemblies MicroShift of modules/microshift-oc-mirror-to-mirror.adoc left in tree.
Auto-merging modules/microshift-oc-mirror-list-ops-catalogs.adoc
CONFLICT (content): Merge conflict in modules/microshift-oc-mirror-list-ops-catalogs.adoc
Auto-merging modules/microshift-oc-mirror-install-catalog-node.adoc
Auto-merging modules/microshift-oc-mirror-embed-ops-disconnected-use.adoc
CONFLICT (content): Merge conflict in modules/microshift-oc-mirror-embed-ops-disconnected-use.adoc
CONFLICT (modify/delete): modules/microshift-oc-mirror-dry-run.adoc deleted in HEAD and modified in OSDOCS-15793: modularizes Operators assemblies MicroShift. Version OSDOCS-15793: modularizes Operators assemblies MicroShift of modules/microshift-oc-mirror-dry-run.adoc left in tree.
Auto-merging modules/microshift-oc-mirror-creating-imageset-config.adoc
CONFLICT (content): Merge conflict in modules/microshift-oc-mirror-creating-imageset-config.adoc
CONFLICT (modify/delete): modules/microshift-oc-mirror-connectivity.adoc deleted in HEAD and modified in OSDOCS-15793: modularizes Operators assemblies MicroShift. Version OSDOCS-15793: modularizes Operators assemblies MicroShift of modules/microshift-oc-mirror-connectivity.adoc left in tree.
Auto-merging modules/microshift-oc-mirror-about-con.adoc
CONFLICT (content): Merge conflict in modules/microshift-oc-mirror-about-con.adoc
Auto-merging microshift_running_apps/microshift_operators/microshift-operators-olm.adoc
CONFLICT (content): Merge conflict in microshift_running_apps/microshift_operators/microshift-operators-olm.adoc
Auto-merging microshift_running_apps/microshift_operators/microshift-operators-oc-mirror.adoc
CONFLICT (content): Merge conflict in microshift_running_apps/microshift_operators/microshift-operators-oc-mirror.adoc
Auto-merging microshift_running_apps/microshift_operators/microshift-operators-oc-mirror-disconnected.adoc
CONFLICT (content): Merge conflict in microshift_running_apps/microshift_operators/microshift-operators-oc-mirror-disconnected.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS-15793: modularizes Operators assemblies MicroShift

In response to this:

/cherrypick enterprise-4.16

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-sigs/prow repository.

This was referenced Nov 6, 2025
Merged
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@michaelryanpeter michaelryanpeter michaelryanpeter left review comments

+1 more reviewer

@ocpdocs-vale-bot ocpdocs-vale-bot ocpdocs-vale-bot left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 branch/enterprise-4.21 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@ShaunaDiaz @openshift-ci-robot @ocpdocs-previewbot @snarayan-redhat @openshift-cherrypick-robot @michaelryanpeter @ocpdocs-vale-bot @openshift-merge-robot