Skip to content

Conversation

@bmcelvee
Copy link
Contributor

@bmcelvee bmcelvee commented Feb 15, 2022

This PR is intended to restructure the ROSA documentation starting with the topic map and arrangement of existing files.
JIRA issue: https://issues.redhat.com/browse/OSDOCS-3289

Netlify preview: https://deploy-preview-41923--osdocs.netlify.app/openshift-rosa/latest/welcome/index.html

Bumping this comment up so it doesn't get lost:
This PR is not adding new content to the ROSA documentation. It is moving assembly files and directories. There are a handful of files that look new, but that is because they new assemblies with content copied directly from existing assemblies in order to support our directory structure. There are also some minor cross reference and metatdata fixes. I've already updated the PR with most of the peer review feedback.

Acks required:
QE: @yuwang-RH
Eng/PM/Product Experience: @sferich888 or @reestr; @okashi18 or @arendej
Docs: @nermina-redhat

Would you all mind giving the new ROSA docs structure a review and ack, please?

Here is the preview: https://deploy-preview-41923--osdocs.netlify.app/openshift-rosa/latest/welcome/index.html

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 15, 2022
@bmcelvee bmcelvee changed the title ROSA topic map restructure [WIP] ROSA topic map restructure Feb 15, 2022
@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 Feb 15, 2022
@netlify
Copy link

netlify bot commented Feb 15, 2022

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: 54cbdf1

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/6231f52a6b91ad000801b313

😎 Browse the preview: https://deploy-preview-41923--osdocs.netlify.app

@bmcelvee bmcelvee force-pushed the rosa-topic-map-reorg branch from 25db693 to 81d0c26 Compare February 15, 2022 15:42
@openshift-ci openshift-ci bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 15, 2022
@bmcelvee bmcelvee force-pushed the rosa-topic-map-reorg branch from 81d0c26 to 0032cd9 Compare February 15, 2022 16:04
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Feb 15, 2022
@bmcelvee bmcelvee force-pushed the rosa-topic-map-reorg branch 2 times, most recently from ff7ba97 to fbd517f Compare February 15, 2022 20:44
@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 Feb 15, 2022
@bmcelvee bmcelvee force-pushed the rosa-topic-map-reorg branch from fbd517f to c9ecc21 Compare February 15, 2022 22:21
@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 Feb 15, 2022
@bmcelvee bmcelvee force-pushed the rosa-topic-map-reorg branch from 1052708 to 69258e9 Compare February 16, 2022 21:37
@openshift-ci openshift-ci bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Feb 16, 2022
@bmcelvee bmcelvee force-pushed the rosa-topic-map-reorg branch 4 times, most recently from 0a0cb41 to 006981f Compare February 21, 2022 16:48
@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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Feb 21, 2022
@bmcelvee bmcelvee force-pushed the rosa-topic-map-reorg branch from 072f9aa to b1ba6e3 Compare March 9, 2022 20:34
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 9, 2022
@bergerhoffer
Copy link
Contributor

The branch/enterprise-4.11 label has been added to this PR.

This is because your PR targets the main branch and is labeled for enterprise-4.10. And any PR going into main must also target the latest version branch (enterprise-4.11).

If the update in your PR does NOT apply to version 4.11 onward, please retarget this PR to go directly into the appropriate version branch or branches (enterprise-4.x) instead of main.

@bmcelvee bmcelvee force-pushed the rosa-topic-map-reorg branch from b1ba6e3 to 54cbdf1 Compare March 16, 2022 14:24
@bmcelvee bmcelvee merged commit 70855cd into openshift:main Mar 16, 2022
@bmcelvee
Copy link
Contributor Author

/cherrypick enterprise-4.9

@bmcelvee
Copy link
Contributor Author

/cherrypick enterprise-4.10

@bmcelvee
Copy link
Contributor Author

/cherrypick enterprise-4.11

@openshift-cherrypick-robot

@bmcelvee: #41923 failed to apply on top of branch "enterprise-4.9":

Applying: ROSA topic map restructure
.git/rebase-apply/patch:661: trailing whitespace.
* link:https://aws.amazon.com/cloudwatch/[Amazon CloudWatch product information] 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/rosa-sts-interactive-mode-reference.adoc
Falling back to patching base and 3-way merge...
Removing rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/modules
Removing rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/images
Removing rosa_getting_started_sts/rosa-sts-getting-started-workflow.adoc
Auto-merging rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc
CONFLICT (content): Merge conflict in rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_monitoring/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/images
CONFLICT (content): Merge conflict in rosa_cluster_admin/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/images
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/images
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ROSA topic map restructure
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.9

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.

@openshift-cherrypick-robot

@bmcelvee: #41923 failed to apply on top of branch "enterprise-4.10":

Applying: ROSA topic map restructure
.git/rebase-apply/patch:661: trailing whitespace.
* link:https://aws.amazon.com/cloudwatch/[Amazon CloudWatch product information] 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/rosa-sts-interactive-mode-reference.adoc
Falling back to patching base and 3-way merge...
Removing rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/modules
Removing rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/images
Removing rosa_getting_started_sts/rosa-sts-getting-started-workflow.adoc
Auto-merging rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc
CONFLICT (content): Merge conflict in rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_monitoring/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/images
CONFLICT (content): Merge conflict in rosa_cluster_admin/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/images
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/images
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ROSA topic map restructure
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.10

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.

@openshift-cherrypick-robot

@bmcelvee: #41923 failed to apply on top of branch "enterprise-4.11":

Applying: ROSA topic map restructure
.git/rebase-apply/patch:661: trailing whitespace.
* link:https://aws.amazon.com/cloudwatch/[Amazon CloudWatch product information] 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/rosa-sts-interactive-mode-reference.adoc
Falling back to patching base and 3-way merge...
Removing rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/modules
Removing rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/images
Removing rosa_getting_started_sts/rosa-sts-getting-started-workflow.adoc
Auto-merging rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc
CONFLICT (content): Merge conflict in rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_monitoring/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/images
CONFLICT (content): Merge conflict in rosa_cluster_admin/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/images
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/images
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ROSA topic map restructure
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.11

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.

@openshift-cherrypick-robot

@bmcelvee: #41923 failed to apply on top of branch "enterprise-4.9":

Applying: ROSA topic map restructure
.git/rebase-apply/patch:661: trailing whitespace.
* link:https://aws.amazon.com/cloudwatch/[Amazon CloudWatch product information] 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/rosa-sts-interactive-mode-reference.adoc
Falling back to patching base and 3-way merge...
Removing rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/modules
Removing rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/images
Removing rosa_getting_started_sts/rosa-sts-getting-started-workflow.adoc
Auto-merging rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc
CONFLICT (content): Merge conflict in rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_monitoring/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/images
CONFLICT (content): Merge conflict in rosa_cluster_admin/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/images
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/images
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ROSA topic map restructure
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.9

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.

@openshift-cherrypick-robot

@bmcelvee: #41923 failed to apply on top of branch "enterprise-4.11":

Applying: ROSA topic map restructure
.git/rebase-apply/patch:661: trailing whitespace.
* link:https://aws.amazon.com/cloudwatch/[Amazon CloudWatch product information] 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/rosa-sts-interactive-mode-reference.adoc
Falling back to patching base and 3-way merge...
Removing rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/modules
Removing rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/images
Removing rosa_getting_started_sts/rosa-sts-getting-started-workflow.adoc
Auto-merging rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc
CONFLICT (content): Merge conflict in rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_monitoring/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/images
CONFLICT (content): Merge conflict in rosa_cluster_admin/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/images
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/images
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ROSA topic map restructure
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.11

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.

@openshift-cherrypick-robot

@bmcelvee: #41923 failed to apply on top of branch "enterprise-4.10":

Applying: ROSA topic map restructure
.git/rebase-apply/patch:661: trailing whitespace.
* link:https://aws.amazon.com/cloudwatch/[Amazon CloudWatch product information] 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/rosa-sts-interactive-mode-reference.adoc
Falling back to patching base and 3-way merge...
Removing rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/modules
Removing rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/images
Removing rosa_getting_started_sts/rosa-sts-getting-started-workflow.adoc
Auto-merging rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc
CONFLICT (content): Merge conflict in rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_monitoring/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/images
CONFLICT (content): Merge conflict in rosa_cluster_admin/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/images
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/images
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ROSA topic map restructure
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.10

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.

@openshift-cherrypick-robot

@bmcelvee: #41923 failed to apply on top of branch "enterprise-4.9":

Applying: ROSA topic map restructure
.git/rebase-apply/patch:661: trailing whitespace.
* link:https://aws.amazon.com/cloudwatch/[Amazon CloudWatch product information] 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/rosa-sts-interactive-mode-reference.adoc
Falling back to patching base and 3-way merge...
Removing rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/modules
Removing rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/images
Removing rosa_getting_started_sts/rosa-sts-getting-started-workflow.adoc
Auto-merging rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc
CONFLICT (content): Merge conflict in rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_monitoring/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/images
CONFLICT (content): Merge conflict in rosa_cluster_admin/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/images
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/images
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ROSA topic map restructure
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.9

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.

1 similar comment
@openshift-cherrypick-robot

@bmcelvee: #41923 failed to apply on top of branch "enterprise-4.9":

Applying: ROSA topic map restructure
.git/rebase-apply/patch:661: trailing whitespace.
* link:https://aws.amazon.com/cloudwatch/[Amazon CloudWatch product information] 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/rosa-sts-interactive-mode-reference.adoc
Falling back to patching base and 3-way merge...
Removing rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/modules
Removing rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/images
Removing rosa_getting_started_sts/rosa-sts-getting-started-workflow.adoc
Auto-merging rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc
CONFLICT (content): Merge conflict in rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_monitoring/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/images
CONFLICT (content): Merge conflict in rosa_cluster_admin/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/images
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/images
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ROSA topic map restructure
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.9

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.

@openshift-cherrypick-robot

@bmcelvee: #41923 failed to apply on top of branch "enterprise-4.11":

Applying: ROSA topic map restructure
.git/rebase-apply/patch:661: trailing whitespace.
* link:https://aws.amazon.com/cloudwatch/[Amazon CloudWatch product information] 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/rosa-sts-interactive-mode-reference.adoc
Falling back to patching base and 3-way merge...
Removing rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/modules
Removing rosa_getting_started_sts/rosa_creating_a_cluster_with_sts/images
Removing rosa_getting_started_sts/rosa-sts-getting-started-workflow.adoc
Auto-merging rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc
CONFLICT (content): Merge conflict in rosa_getting_started/rosa_getting_started_sts/rosa-sts-interactive-mode-reference.adoc
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_monitoring/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/rosa_logging/images
CONFLICT (content): Merge conflict in rosa_cluster_admin/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/images
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/snippets
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/modules
CONFLICT (content): Merge conflict in rosa_cluster_admin/cloud_infrastructure_access/images
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ROSA topic map restructure
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.11

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.10 branch/enterprise-4.11 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.