Change folder structure to allow for two versions of OSSM docs. #25576

JStickler · 2020-09-17T21:30:45Z

This PR contains the following work to support two versions of the Service Mesh documentation inside the OpenShift docs:

Creates two service mesh folders: v1x and v2x and copies the project folder structure into each.
Clones the following modules that reference components that are deprecated in 2.0 so they can be versioned or removed.
▪ ossm-architecture
▪ ossm-control-plane-deploy (Pilot)
▪ ossm-cr-example (Mixer) (Pilot)
▪ ossm-cr-mixer (Mixer)
▪ ossm-cr-pilot (Pilot)
▪ ossm-mixer-policy (Mixer)
▪ ossm-vs-istio (Galley)
Creates cloned modules for the release notes so they can be versioned.
▪ ossm-document-attributes-1x
▪ ossm-rn-deprecated-features-1x
▪ ossm-rn-fixed-features-1x
▪ ossm-rn-known-features-1x
▪ ossm-rn-new-features-1x
Updates the module IDs on the versioned modules to be unique (added version)
Updates service mesh assemblies in the v1x folder that point to the cloned modules
▪ servicemesh-release-notes
▪ Arch/understanding-ossm
▪ Arch/ossm-vs-community
▪ Install/installing-ossm
▪ Intall/customizing-installation-ossm
▪ Install/prepare-to-deploy-applications-ossm
Updates the 1x assemblies to use the ossm-document-attributes-1x file.
Updates the topic map to point to the current release (v1x)
Has a file (_topic_map_NEXT.yml) temporarily in the 2x folder with planned topic map updates to support two branches.
Updates cross references that point to service mesh in the following files:
• jaeger_install/rhbjaeger-deploying
• jaeger_install/rhbjaeger-installation
• migration/migrating_3_4/planning-migration-3-to-4.adoc
• post_installation_configuration/network-configuration.adoc
• service_mesh_install/installing-ossm
• serverless/networking/serverless-ossm.adoc (3 links)

But wait, there's more! After discussing with the team how losing the "books" in our structure meant we needed to make more changes, we added the following work:
▪ Added -v1x to all the assembly IDs in the v1x folder so that all cloned assembly IDs are still unique.
▪ Combined the Istio, Kiali and Jaeger architecture assemblies into single assembly
• Renamed file from understanding-ossm to ossm-architecture and changed file ID to match
▪ Comparing Service Mesh and Upstream changed heading to "Service Mesh and Istio Differences"
▪ Updating Service Mesh - Merged into end of Installing assembly
▪ Removing Service Mesh - Merged into end of Installing assembly
▪ Converted Configuring Jaeger assembly into a module, change the name to ossm-jaeger-configuring and added to customizing-installaltion-ossm assembly
▪ Moved bookinfo example into the Deploying assembly
▪ Moved Distributed tracing tutorial into the Deploying assembly
• Changed heading to "Generating sample traces and analyzing trace data”
▪ Converted Automatic route creation assembly into a module and added to the customizing-installaltion-ossm assembly
▪ Converted the collecting service mesh data assembly into a module and added to the Release Notes under the Support topic
▪ Changed the order of the “user guide” assemblies in the topic map to be (1) Data Visualization and Observability (2) Security and (3) Traffic Management.
▪ Fixed an XREFs that broke due to path changes, file name changes and/or assembly ID changes. Currently all XREFs point to the version 1.x docs.

openshift-docs-preview-bot · 2020-09-18T19:11:16Z

The preview will be available shortly at:

https://branch_SM_Docs--ocpdocs.netlify.com/

JStickler · 2020-10-06T18:03:41Z

@abrennan89 @darrenfennesy FYI we're making organizational changes to the Service Mesh docs to support two docs branches.

modules/ossm-auto-route.adoc

modules/ossm-document-attributes.adoc

modules/ossm-rn-deprecated-features.adoc

neal-timpe

Looks good, but now that I've merged that change for the conscious language project, it looks like it needs a quick rebase.

neal-timpe · 2020-10-07T15:29:13Z

/cherry-pick enterprise-4.3

openshift-cherrypick-robot · 2020-10-07T15:29:18Z

@neal-timpe: #25576 failed to apply on top of branch "enterprise-4.3":

Applying: Squashed commits for branching service mesh docs.
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	jaeger/jaeger_install/rhbjaeger-deploying.adoc
M	jaeger/jaeger_install/rhbjaeger-installation.adoc
M	migration/migrating_3_4/planning-migration-3-to-4.adoc
M	modules/about-must-gather.adoc
M	modules/jaeger-install-elasticsearch.adoc
M	modules/jaeger-install.adoc
M	modules/ossm-automatic-sidecar-injection.adoc
M	modules/ossm-installation-activities.adoc
M	modules/ossm-member-roll-create.adoc
M	modules/ossm-operatorhub-install.adoc
M	modules/ossm-supported-configurations.adoc
M	modules/support.adoc
A	post_installation_configuration/network-configuration.adoc
A	serverless/networking/serverless-ossm-custom-domains.adoc
A	serverless/networking/serverless-ossm-jwt.adoc
A	serverless/networking/serverless-ossm.adoc
M	service_mesh/service_mesh_day_two/ossm-auto-route.adoc
M	service_mesh/service_mesh_install/customizing-installation-ossm.adoc
M	service_mesh/service_mesh_install/preparing-ossm-installation.adoc
M	service_mesh/service_mesh_install/updating-ossm.adoc
M	service_mesh/service_mesh_support/ossm-collecting-ossm-data.adoc
A	service_mesh/service_mesh_user_guide/images
A	service_mesh/service_mesh_user_guide/modules
Falling back to patching base and 3-way merge...
Auto-merging service_mesh/v2x/preparing-ossm-installation.adoc
CONFLICT (content): Merge conflict in service_mesh/v2x/modules
CONFLICT (content): Merge conflict in service_mesh/v2x/images
Auto-merging service_mesh/v2x/customizing-installation-ossm.adoc
CONFLICT (content): Merge conflict in service_mesh/v2x/customizing-installation-ossm.adoc
CONFLICT (content): Merge conflict in service_mesh/v1x/modules
CONFLICT (content): Merge conflict in service_mesh/v1x/images
CONFLICT (modify/delete): service_mesh/service_mesh_support/ossm-collecting-ossm-data.adoc deleted in Squashed commits for branching service mesh docs. and modified in HEAD. Version HEAD of service_mesh/service_mesh_support/ossm-collecting-ossm-data.adoc left in tree.
CONFLICT (modify/delete): service_mesh/service_mesh_install/updating-ossm.adoc deleted in Squashed commits for branching service mesh docs. and modified in HEAD. Version HEAD of service_mesh/service_mesh_install/updating-ossm.adoc left in tree.
Removing service_mesh/service_mesh_install/removing-ossm.adoc
Removing service_mesh/service_mesh_install/installing-ossm.adoc
Removing service_mesh/service_mesh_day_two/prepare-to-deploy-applications-ossm.adoc
Removing service_mesh/service_mesh_day_two/ossm-tutorial-prometheus.adoc
Removing service_mesh/service_mesh_day_two/ossm-tutorial-jaeger-tracing.adoc
Removing service_mesh/service_mesh_day_two/ossm-tutorial-grafana.adoc
Removing service_mesh/service_mesh_day_two/ossm-example-bookinfo.adoc
Removing service_mesh/service_mesh_day_two/modules
Removing service_mesh/service_mesh_day_two/images
Removing service_mesh/service_mesh_day_two/configuring-jaeger.adoc
Removing service_mesh/service_mesh_arch/understanding-ossm.adoc
Removing service_mesh/service_mesh_arch/ossm-kiali.adoc
Removing service_mesh/service_mesh_arch/modules
Removing service_mesh/service_mesh_arch/images
Removing service_mesh/modules
Removing service_mesh/images
CONFLICT (modify/delete): serverless/networking/serverless-ossm.adoc deleted in HEAD and modified in Squashed commits for branching service mesh docs.. Version Squashed commits for branching service mesh docs. of serverless/networking/serverless-ossm.adoc left in tree.
CONFLICT (modify/delete): serverless/networking/serverless-ossm-jwt.adoc deleted in HEAD and modified in Squashed commits for branching service mesh docs.. Version Squashed commits for branching service mesh docs. of serverless/networking/serverless-ossm-jwt.adoc left in tree.
CONFLICT (modify/delete): serverless/networking/serverless-ossm-custom-domains.adoc deleted in HEAD and modified in Squashed commits for branching service mesh docs.. Version Squashed commits for branching service mesh docs. of serverless/networking/serverless-ossm-custom-domains.adoc left in tree.
CONFLICT (modify/delete): post_installation_configuration/network-configuration.adoc deleted in HEAD and modified in Squashed commits for branching service mesh docs.. Version Squashed commits for branching service mesh docs. of post_installation_configuration/network-configuration.adoc left in tree.
Auto-merging modules/support.adoc
Auto-merging modules/ossm-supported-configurations.adoc
CONFLICT (content): Merge conflict in modules/ossm-supported-configurations.adoc
CONFLICT (modify/delete): modules/ossm-operatorhub-install.adoc deleted in Squashed commits for branching service mesh docs. and modified in HEAD. Version HEAD of modules/ossm-operatorhub-install.adoc left in tree.
Auto-merging modules/ossm-member-roll-create.adoc
Auto-merging modules/ossm-installation-activities.adoc
CONFLICT (content): Merge conflict in modules/ossm-installation-activities.adoc
Auto-merging modules/ossm-automatic-sidecar-injection.adoc
Auto-merging modules/ossm-auto-route.adoc
CONFLICT (content): Merge conflict in modules/ossm-auto-route.adoc
Auto-merging modules/jaeger-install.adoc
Auto-merging modules/jaeger-install-elasticsearch.adoc
Auto-merging modules/about-must-gather.adoc
Auto-merging migration/migrating_3_4/planning-migration-3-to-4.adoc
CONFLICT (content): Merge conflict in migration/migrating_3_4/planning-migration-3-to-4.adoc
Auto-merging jaeger/jaeger_install/rhbjaeger-installation.adoc
Auto-merging jaeger/jaeger_install/rhbjaeger-deploying.adoc
CONFLICT (rename/delete): service_mesh/service_mesh_user_guide/images deleted in Squashed commits for branching service mesh docs. and renamed to cnv/images in HEAD. Version HEAD of cnv/images left in tree.
CONFLICT (rename/delete): service_mesh/service_mesh_user_guide/modules deleted in Squashed commits for branching service mesh docs. and renamed to cloud_providers/modules in HEAD. Version HEAD of cloud_providers/modules left in tree.
Auto-merging _topic_map.yml
CONFLICT (content): Merge conflict in _topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Squashed commits for branching service mesh docs.
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:

/cherry-pick enterprise-4.3

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.

neal-timpe · 2020-10-07T15:29:28Z

/cherry-pick enterprise-4.4

openshift-cherrypick-robot · 2020-10-07T15:29:35Z

@neal-timpe: #25576 failed to apply on top of branch "enterprise-4.4":

Applying: Squashed commits for branching service mesh docs.
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	jaeger/jaeger_install/rhbjaeger-deploying.adoc
M	migration/migrating_3_4/planning-migration-3-to-4.adoc
M	modules/about-must-gather.adoc
M	modules/jaeger-install-elasticsearch.adoc
M	modules/jaeger-install.adoc
M	modules/ossm-installation-activities.adoc
M	modules/ossm-member-roll-create.adoc
M	modules/ossm-operatorhub-install.adoc
M	modules/ossm-supported-configurations.adoc
M	modules/support.adoc
A	post_installation_configuration/network-configuration.adoc
A	serverless/networking/serverless-ossm-custom-domains.adoc
A	serverless/networking/serverless-ossm-jwt.adoc
A	serverless/networking/serverless-ossm.adoc
M	service_mesh/service_mesh_day_two/ossm-auto-route.adoc
M	service_mesh/service_mesh_day_two/prepare-to-deploy-applications-ossm.adoc
M	service_mesh/service_mesh_install/customizing-installation-ossm.adoc
M	service_mesh/service_mesh_install/preparing-ossm-installation.adoc
M	service_mesh/service_mesh_install/updating-ossm.adoc
A	service_mesh/service_mesh_user_guide/images
A	service_mesh/service_mesh_user_guide/modules
Falling back to patching base and 3-way merge...
Auto-merging service_mesh/v2x/preparing-ossm-installation.adoc
CONFLICT (content): Merge conflict in service_mesh/v2x/modules
CONFLICT (content): Merge conflict in service_mesh/v2x/images
Auto-merging service_mesh/v2x/customizing-installation-ossm.adoc
CONFLICT (content): Merge conflict in service_mesh/v2x/customizing-installation-ossm.adoc
CONFLICT (content): Merge conflict in service_mesh/v1x/modules
CONFLICT (content): Merge conflict in service_mesh/v1x/images
Removing service_mesh/service_mesh_support/ossm-collecting-ossm-data.adoc
CONFLICT (modify/delete): service_mesh/service_mesh_install/updating-ossm.adoc deleted in Squashed commits for branching service mesh docs. and modified in HEAD. Version HEAD of service_mesh/service_mesh_install/updating-ossm.adoc left in tree.
Removing service_mesh/service_mesh_install/removing-ossm.adoc
Removing service_mesh/service_mesh_install/installing-ossm.adoc
CONFLICT (modify/delete): service_mesh/service_mesh_day_two/prepare-to-deploy-applications-ossm.adoc deleted in Squashed commits for branching service mesh docs. and modified in HEAD. Version HEAD of service_mesh/service_mesh_day_two/prepare-to-deploy-applications-ossm.adoc left in tree.
Removing service_mesh/service_mesh_day_two/ossm-tutorial-prometheus.adoc
Removing service_mesh/service_mesh_day_two/ossm-tutorial-jaeger-tracing.adoc
Removing service_mesh/service_mesh_day_two/ossm-tutorial-grafana.adoc
Removing service_mesh/service_mesh_day_two/ossm-example-bookinfo.adoc
Removing service_mesh/service_mesh_day_two/modules
Removing service_mesh/service_mesh_day_two/images
Removing service_mesh/service_mesh_day_two/configuring-jaeger.adoc
Removing service_mesh/service_mesh_arch/understanding-ossm.adoc
Removing service_mesh/service_mesh_arch/ossm-kiali.adoc
Removing service_mesh/service_mesh_arch/modules
Removing service_mesh/service_mesh_arch/images
Removing service_mesh/modules
Removing service_mesh/images
CONFLICT (modify/delete): serverless/networking/serverless-ossm.adoc deleted in HEAD and modified in Squashed commits for branching service mesh docs.. Version Squashed commits for branching service mesh docs. of serverless/networking/serverless-ossm.adoc left in tree.
CONFLICT (modify/delete): serverless/networking/serverless-ossm-jwt.adoc deleted in HEAD and modified in Squashed commits for branching service mesh docs.. Version Squashed commits for branching service mesh docs. of serverless/networking/serverless-ossm-jwt.adoc left in tree.
CONFLICT (modify/delete): serverless/networking/serverless-ossm-custom-domains.adoc deleted in HEAD and modified in Squashed commits for branching service mesh docs.. Version Squashed commits for branching service mesh docs. of serverless/networking/serverless-ossm-custom-domains.adoc left in tree.
CONFLICT (modify/delete): post_installation_configuration/network-configuration.adoc deleted in HEAD and modified in Squashed commits for branching service mesh docs.. Version Squashed commits for branching service mesh docs. of post_installation_configuration/network-configuration.adoc left in tree.
Auto-merging modules/support.adoc
Auto-merging modules/ossm-supported-configurations.adoc
CONFLICT (content): Merge conflict in modules/ossm-supported-configurations.adoc
CONFLICT (modify/delete): modules/ossm-operatorhub-install.adoc deleted in Squashed commits for branching service mesh docs. and modified in HEAD. Version HEAD of modules/ossm-operatorhub-install.adoc left in tree.
Auto-merging modules/ossm-member-roll-create.adoc
Auto-merging modules/ossm-installation-activities.adoc
CONFLICT (content): Merge conflict in modules/ossm-installation-activities.adoc
Auto-merging modules/ossm-auto-route.adoc
CONFLICT (content): Merge conflict in modules/ossm-auto-route.adoc
Auto-merging modules/jaeger-install.adoc
Auto-merging modules/jaeger-install-elasticsearch.adoc
Auto-merging modules/about-must-gather.adoc
Auto-merging migration/migrating_3_4/planning-migration-3-to-4.adoc
CONFLICT (content): Merge conflict in migration/migrating_3_4/planning-migration-3-to-4.adoc
Auto-merging jaeger/jaeger_install/rhbjaeger-deploying.adoc
CONFLICT (rename/delete): service_mesh/service_mesh_user_guide/images deleted in Squashed commits for branching service mesh docs. and renamed to cnv/images in HEAD. Version HEAD of cnv/images left in tree.
CONFLICT (rename/delete): service_mesh/service_mesh_user_guide/modules deleted in Squashed commits for branching service mesh docs. and renamed to cloud_providers/modules in HEAD. Version HEAD of cloud_providers/modules left in tree.
Auto-merging _topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Squashed commits for branching service mesh docs.
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:

/cherry-pick enterprise-4.4

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.

neal-timpe · 2020-10-07T15:29:46Z

/cherry-pick enterprise-4.5

openshift-cherrypick-robot · 2020-10-07T15:29:51Z

@neal-timpe: #25576 failed to apply on top of branch "enterprise-4.5":

Applying: Squashed commits for branching service mesh docs.
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	migration/migrating_3_4/planning-migration-3-to-4.adoc
M	modules/jaeger-install-elasticsearch.adoc
M	modules/ossm-control-plane-deploy.adoc
M	modules/ossm-member-roll-create.adoc
M	service_mesh/service_mesh_day_two/prepare-to-deploy-applications-ossm.adoc
Falling back to patching base and 3-way merge...
CONFLICT (content): Merge conflict in service_mesh/v2x/modules
CONFLICT (content): Merge conflict in service_mesh/v2x/images
CONFLICT (content): Merge conflict in service_mesh/v1x/modules
CONFLICT (content): Merge conflict in service_mesh/v1x/images
Removing service_mesh/service_mesh_user_guide/modules
Removing service_mesh/service_mesh_user_guide/images
Removing service_mesh/service_mesh_support/ossm-collecting-ossm-data.adoc
Removing service_mesh/service_mesh_install/updating-ossm.adoc
Removing service_mesh/service_mesh_install/removing-ossm.adoc
Removing service_mesh/service_mesh_install/installing-ossm.adoc
CONFLICT (modify/delete): service_mesh/service_mesh_day_two/prepare-to-deploy-applications-ossm.adoc deleted in Squashed commits for branching service mesh docs. and modified in HEAD. Version HEAD of service_mesh/service_mesh_day_two/prepare-to-deploy-applications-ossm.adoc left in tree.
Removing service_mesh/service_mesh_day_two/ossm-tutorial-prometheus.adoc
Removing service_mesh/service_mesh_day_two/ossm-tutorial-jaeger-tracing.adoc
Removing service_mesh/service_mesh_day_two/ossm-tutorial-grafana.adoc
Removing service_mesh/service_mesh_day_two/ossm-example-bookinfo.adoc
Removing service_mesh/service_mesh_day_two/modules
Removing service_mesh/service_mesh_day_two/images
Removing service_mesh/service_mesh_day_two/configuring-jaeger.adoc
Removing service_mesh/service_mesh_arch/understanding-ossm.adoc
Removing service_mesh/service_mesh_arch/ossm-kiali.adoc
Removing service_mesh/service_mesh_arch/modules
Removing service_mesh/service_mesh_arch/images
Removing service_mesh/modules
Removing service_mesh/images
Removing modules/ossm-operatorhub-install.adoc
Auto-merging modules/ossm-member-roll-create.adoc
Auto-merging modules/ossm-control-plane-deploy.adoc
Auto-merging modules/jaeger-install-elasticsearch.adoc
Auto-merging migration/migrating_3_4/planning-migration-3-to-4.adoc
Auto-merging _topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Squashed commits for branching service mesh docs.
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:

/cherry-pick enterprise-4.5

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.

neal-timpe · 2020-10-07T15:29:58Z

/cherry-pick enterprise-4.6

openshift-cherrypick-robot · 2020-10-07T15:30:03Z

@neal-timpe: #25576 failed to apply on top of branch "enterprise-4.6":

Applying: Squashed commits for branching service mesh docs.
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	modules/jaeger-install-elasticsearch.adoc
M	modules/jaeger-install.adoc
M	modules/ossm-control-plane-deploy.adoc
M	modules/ossm-member-roll-create.adoc
M	modules/ossm-operatorhub-install.adoc
M	service_mesh/service_mesh_day_two/prepare-to-deploy-applications-ossm.adoc
Falling back to patching base and 3-way merge...
CONFLICT (content): Merge conflict in service_mesh/v2x/modules
CONFLICT (content): Merge conflict in service_mesh/v2x/images
CONFLICT (content): Merge conflict in service_mesh/v1x/modules
CONFLICT (content): Merge conflict in service_mesh/v1x/images
Removing service_mesh/service_mesh_user_guide/modules
Removing service_mesh/service_mesh_user_guide/images
Removing service_mesh/service_mesh_support/ossm-collecting-ossm-data.adoc
Removing service_mesh/service_mesh_install/updating-ossm.adoc
Removing service_mesh/service_mesh_install/removing-ossm.adoc
Removing service_mesh/service_mesh_install/installing-ossm.adoc
CONFLICT (modify/delete): service_mesh/service_mesh_day_two/prepare-to-deploy-applications-ossm.adoc deleted in Squashed commits for branching service mesh docs. and modified in HEAD. Version HEAD of service_mesh/service_mesh_day_two/prepare-to-deploy-applications-ossm.adoc left in tree.
Removing service_mesh/service_mesh_day_two/ossm-tutorial-prometheus.adoc
Removing service_mesh/service_mesh_day_two/ossm-tutorial-jaeger-tracing.adoc
Removing service_mesh/service_mesh_day_two/ossm-tutorial-grafana.adoc
Removing service_mesh/service_mesh_day_two/ossm-example-bookinfo.adoc
Removing service_mesh/service_mesh_day_two/modules
Removing service_mesh/service_mesh_day_two/images
Removing service_mesh/service_mesh_day_two/configuring-jaeger.adoc
Removing service_mesh/service_mesh_arch/understanding-ossm.adoc
Removing service_mesh/service_mesh_arch/ossm-kiali.adoc
Removing service_mesh/service_mesh_arch/modules
Removing service_mesh/service_mesh_arch/images
Removing service_mesh/modules
Removing service_mesh/images
CONFLICT (modify/delete): modules/ossm-operatorhub-install.adoc deleted in Squashed commits for branching service mesh docs. and modified in HEAD. Version HEAD of modules/ossm-operatorhub-install.adoc left in tree.
Auto-merging modules/ossm-member-roll-create.adoc
Auto-merging modules/ossm-control-plane-deploy.adoc
Auto-merging modules/jaeger-install.adoc
Auto-merging modules/jaeger-install-elasticsearch.adoc
Auto-merging _topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Squashed commits for branching service mesh docs.
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:

/cherry-pick enterprise-4.6

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-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 17, 2020

JStickler force-pushed the branch_SM_Docs branch 17 times, most recently from 5bcfcb1 to c9be76f Compare September 18, 2020 17:59

openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 18, 2020

JStickler force-pushed the branch_SM_Docs branch from c9be76f to d4bb5a0 Compare September 18, 2020 18:00

openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 18, 2020

JStickler force-pushed the branch_SM_Docs branch 5 times, most recently from c43e4e0 to 322075a Compare September 18, 2020 19:08

JStickler force-pushed the branch_SM_Docs branch 2 times, most recently from c2cdb0b to 889749f Compare September 24, 2020 20:22

JStickler requested a review from neal-timpe October 6, 2020 17:47

JStickler added this to the Next Release milestone Oct 6, 2020

JStickler added the peer-review-needed Signifies that the peer review team needs to review this PR label Oct 6, 2020

JStickler force-pushed the branch_SM_Docs branch 3 times, most recently from 9c28c47 to f955499 Compare October 6, 2020 18:01

JStickler requested a review from abrennan89 October 6, 2020 18:02

JStickler force-pushed the branch_SM_Docs branch from f955499 to 2681d3a Compare October 6, 2020 18:41

JStickler changed the title ~~[WIP] Change folder structure to allow for two versions of OSSM docs.~~ Change folder structure to allow for two versions of OSSM docs. Oct 6, 2020

openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 6, 2020

neal-timpe requested changes Oct 6, 2020

View reviewed changes

modules/ossm-auto-route.adoc Show resolved Hide resolved

modules/ossm-document-attributes.adoc Outdated Show resolved Hide resolved

modules/ossm-rn-deprecated-features.adoc Show resolved Hide resolved

JStickler force-pushed the branch_SM_Docs branch from 2681d3a to 9fa8f59 Compare October 6, 2020 19:46

neal-timpe approved these changes Oct 6, 2020

View reviewed changes

Squashed commits for branching service mesh docs.

a786e9e

JStickler force-pushed the branch_SM_Docs branch from 9fa8f59 to a786e9e Compare October 6, 2020 20:48

neal-timpe merged commit 4a3ef4a into openshift:master Oct 7, 2020

This was referenced Oct 7, 2020

[enterprise-4.5] Change folder structure to allow for two versions of OSSM docs 4.5 #26196

Merged

[enterprise-4.6] Change folder structure to allow for two versions of OSSM docs 4.6 #26198

Merged

This was referenced Oct 7, 2020

[enterprise-4.4] Merging PR25576 branching service mesh docs into 4.4 branch. #26204

Merged

[enterprise-4.3] Merging PR25576 branching service mesh docs into 4.3 branch. #26200

Merged

JStickler deleted the branch_SM_Docs branch July 28, 2021 02:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Change folder structure to allow for two versions of OSSM docs. #25576

Change folder structure to allow for two versions of OSSM docs. #25576

JStickler commented Sep 17, 2020 •

edited

openshift-docs-preview-bot commented Sep 18, 2020

JStickler commented Oct 6, 2020

neal-timpe left a comment

neal-timpe commented Oct 7, 2020

openshift-cherrypick-robot commented Oct 7, 2020

neal-timpe commented Oct 7, 2020

openshift-cherrypick-robot commented Oct 7, 2020

neal-timpe commented Oct 7, 2020

openshift-cherrypick-robot commented Oct 7, 2020

neal-timpe commented Oct 7, 2020

openshift-cherrypick-robot commented Oct 7, 2020

Change folder structure to allow for two versions of OSSM docs. #25576

Change folder structure to allow for two versions of OSSM docs. #25576

Conversation

JStickler commented Sep 17, 2020 • edited

openshift-docs-preview-bot commented Sep 18, 2020

JStickler commented Oct 6, 2020

neal-timpe left a comment

Choose a reason for hiding this comment

neal-timpe commented Oct 7, 2020

openshift-cherrypick-robot commented Oct 7, 2020

neal-timpe commented Oct 7, 2020

openshift-cherrypick-robot commented Oct 7, 2020

neal-timpe commented Oct 7, 2020

openshift-cherrypick-robot commented Oct 7, 2020

neal-timpe commented Oct 7, 2020

openshift-cherrypick-robot commented Oct 7, 2020

JStickler commented Sep 17, 2020 •

edited