Skip to content

[service-mesh-docs-3.0] OSSM-8881 docinfo.xml and other strangeness #88840

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

Merged
merged 2 commits into from
Feb 18, 2025
Merged

[service-mesh-docs-3.0] OSSM-8881 docinfo.xml and other strangeness #88840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a91b8ee
OSSM-8881 docinfo.xml and other strangeness
gwynnemonahan Feb 17, 2025
199800f
Remove cert-manager from topic map (Squash)
gwynnemonahan Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions _topic_maps/_topic_map.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ Topics:
File: ossm-migrating-premigration-checklists-assembly
- Name: Migrating network policies for security purposes
File: ossm-migrating-network-policies-security-assembly
- Name: Migrating with cert-manager
File: ossm-migrating-cert-manager-assembly
- Name: Kiali differences for Service Mesh 3
File: ossm-migrating-kiali-differences-assembly
#Kiali PR https://github.com/openshift/openshift-docs/pull/88193
Expand Down
7 changes: 0 additions & 7 deletions migrating/checklists/ossm-migrating-cert-manager-assembly.adoc
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions migrating/checklists/ossm-migrating-kiali-differences-assembly.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
<<<<<<< HEAD
// This module is used in the following assemblies:

// * migrating/checklists/ossm-kiali-differences-assembly.adoc

=======
>>>>>>> 12a76b9aec (OSSM-8673 Staging and Testing Migration Guides IA/Content)
:_mod-docs-content-type: ASSEMBLY
[id=ossm-migrating-kiali-differences-assembly]
[id="ossm-migrating-kiali-differences-assembly"]
= Kiali differences for {SMProductName} 3
include::_attributes/common-attributes.adoc[]
:context: ossm-migrating-kiali-differences-assembly

toc::[]
<<<<<<< HEAD

{kialiproduct} with {SMProductName} 3 introduces the following changes:

Expand Down Expand Up @@ -63,5 +59,3 @@ The following configuration settings have been renamed:
|===

These changes reflect evolving capabilities and configuration standards of Kiali within {SMProduct} 3.
=======
>>>>>>> 12a76b9aec (OSSM-8673 Staging and Testing Migration Guides IA/Content)
2 changes: 1 addition & 1 deletion migrating/checklists/ossm-migrating-network-policies-security-assembly.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:_mod-docs-content-type: ASSEMBLY
[id=ossm-migrating-network-policies-security-assembly]
[id="ossm-migrating-network-policies-security-assembly"]
= Network policies for security purposes
include::_attributes/common-attributes.adoc[]
:context: ossm-migrating-network-policies-security-assembly
Expand Down
2 changes: 1 addition & 1 deletion migrating/checklists/ossm-migrating-premigration-checklists-assembly.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:_mod-docs-content-type: ASSEMBLY
[id=ossm-migrating-premigration-checklists-assembly]
[id="ossm-migrating-premigration-checklists-assembly"]
= Premigration checklists
include::_attributes/common-attributes.adoc[]
:context: ossm-migrating-premigration-checklists-assembly
Expand Down
2 changes: 1 addition & 1 deletion migrating/checklists/ossm-migrating-read-me-assembly.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:_mod-docs-content-type: ASSEMBLY
[id=ossm-migrating-read-me-assembly]
[id="ossm-migrating-read-me-assembly"]
= Important information to know if you are migrating from OpenShift Service Mesh 2.6
include::_attributes/common-attributes.adoc[]
:context: ossm-migrating-read-me-assembly
Expand Down
2 changes: 1 addition & 1 deletion migrating/ossm-migrating-from-2-to-3-assembly.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:_mod-docs-content-type: ASSEMBLY
[id=ossm-migrating-from-2-to-3-assembly]
[id="ossm-migrating-from-2-to-3-assembly"]
= Migrating from Service Mesh 2 to Service Mesh 3
include::_attributes/common-attributes.adoc[]
:context: ossm-migrating-from-2-to-3-assembly
Expand Down