From a91b8ee86b55e61b03d57618e07d2f3c0bee17d5 Mon Sep 17 00:00:00 2001 From: Gwynne Monahan Date: Mon, 17 Feb 2025 17:37:36 -0600 Subject: [PATCH 1/2] OSSM-8881 docinfo.xml and other strangeness --- .../checklists/ossm-migrating-cert-manager-assembly.adoc | 7 ------- .../ossm-migrating-kiali-differences-assembly.adoc | 8 +------- ...ossm-migrating-network-policies-security-assembly.adoc | 2 +- .../ossm-migrating-premigration-checklists-assembly.adoc | 2 +- migrating/checklists/ossm-migrating-read-me-assembly.adoc | 2 +- migrating/ossm-migrating-from-2-to-3-assembly.adoc | 2 +- 6 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 migrating/checklists/ossm-migrating-cert-manager-assembly.adoc diff --git a/migrating/checklists/ossm-migrating-cert-manager-assembly.adoc b/migrating/checklists/ossm-migrating-cert-manager-assembly.adoc deleted file mode 100644 index b165984a577c..000000000000 --- a/migrating/checklists/ossm-migrating-cert-manager-assembly.adoc +++ /dev/null @@ -1,7 +0,0 @@ -:_mod-docs-content-type: ASSEMBLY -[id="ossm-migrating-cert-manager-assembly"] -= Migrating from {SMProduct} 2 to {SMProduct} 3 with cert-manager -include::_attributes/common-attributes.adoc[] -:context: ossm-migrating-kiali-differences-assembly - -toc::[] diff --git a/migrating/checklists/ossm-migrating-kiali-differences-assembly.adoc b/migrating/checklists/ossm-migrating-kiali-differences-assembly.adoc index 538c4e0aba65..b11786b9bb39 100644 --- a/migrating/checklists/ossm-migrating-kiali-differences-assembly.adoc +++ b/migrating/checklists/ossm-migrating-kiali-differences-assembly.adoc @@ -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: @@ -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) diff --git a/migrating/checklists/ossm-migrating-network-policies-security-assembly.adoc b/migrating/checklists/ossm-migrating-network-policies-security-assembly.adoc index f6b61fe77bff..3d32dc10b4be 100644 --- a/migrating/checklists/ossm-migrating-network-policies-security-assembly.adoc +++ b/migrating/checklists/ossm-migrating-network-policies-security-assembly.adoc @@ -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 diff --git a/migrating/checklists/ossm-migrating-premigration-checklists-assembly.adoc b/migrating/checklists/ossm-migrating-premigration-checklists-assembly.adoc index 6a2bb52aa0bd..c3426879df67 100644 --- a/migrating/checklists/ossm-migrating-premigration-checklists-assembly.adoc +++ b/migrating/checklists/ossm-migrating-premigration-checklists-assembly.adoc @@ -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 diff --git a/migrating/checklists/ossm-migrating-read-me-assembly.adoc b/migrating/checklists/ossm-migrating-read-me-assembly.adoc index c56657d7878d..c7af41a92d0f 100644 --- a/migrating/checklists/ossm-migrating-read-me-assembly.adoc +++ b/migrating/checklists/ossm-migrating-read-me-assembly.adoc @@ -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 diff --git a/migrating/ossm-migrating-from-2-to-3-assembly.adoc b/migrating/ossm-migrating-from-2-to-3-assembly.adoc index a3b0f798c489..a20117ef4620 100644 --- a/migrating/ossm-migrating-from-2-to-3-assembly.adoc +++ b/migrating/ossm-migrating-from-2-to-3-assembly.adoc @@ -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 From 199800f5de878faaa492a262aa656c363191b9fb Mon Sep 17 00:00:00 2001 From: Gwynne Monahan Date: Tue, 18 Feb 2025 05:26:47 -0600 Subject: [PATCH 2/2] Remove cert-manager from topic map (Squash) --- _topic_maps/_topic_map.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index 328af5b8911b..d0f65b4b324e 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -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