Skip to content

Commit 4e590ec

Browse files
authored
Merge pull request #90818 from openshift-cherrypick-robot/cherry-pick-90711-to-service-mesh-docs-3.0
[service-mesh-docs-3.0] OSSM-9054 Other files ending in assembly
2 parents c0fdc6f + 8dff97b commit 4e590ec

File tree

45 files changed

+74
-82
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+74
-82
lines changed

_topic_maps/_topic_map.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ Dir: ossm-release-notes
44
Distros: openshift-service-mesh
55
Topics:
66
- Name: Service Mesh 3.x release notes
7-
File: ossm-release-notes-assembly
7+
File: ossm-release-notes
88
- Name: Service Mesh 3.x feature support tables
9-
File: ossm-release-notes-support-tables-assembly
9+
File: ossm-release-notes-support-tables
1010
---
1111
Name: Migrating from Service Mesh 2 to Service Mesh 3
1212
Dir: migrating
@@ -58,7 +58,7 @@ Topics:
5858
- Name: About OpenShift Service Mesh
5959
File: ossm-about-openshift-service-mesh
6060
- Name: Understanding Service Mesh
61-
File: ossm-about-concepts-assembly
61+
File: ossm-about-concepts
6262
---
6363
Name: Installing
6464
Dir: install
@@ -69,9 +69,9 @@ Topics:
6969
- Name: Installing OpenShift Service Mesh
7070
File: ossm-installing-openshift-service-mesh
7171
- Name: Sidecar injection
72-
File: ossm-sidecar-injection-assembly
72+
File: ossm-sidecar-injection
7373
- Name: Red Hat OpenShift Service Mesh and cert-manager
74-
File: ossm-cert-manager-assembly
74+
File: ossm-cert-manager
7575
- Name: Multi-Cluster topologies
7676
File: ossm-multi-cluster-topologies
7777
- Name: Deploying multiple service meshes on a single cluster
@@ -104,22 +104,22 @@ Dir: observability
104104
Distros: openshift-service-mesh
105105
Topics:
106106
- Name: Observability and Service Mesh
107-
File: ossm-observability-service-mesh-assembly
107+
File: ossm-observability-service-mesh
108108
- Name: Metrics and Service Mesh
109109
Dir: metrics
110110
Topics:
111111
- Name: Using metrics with Service Mesh
112-
File: ossm-metrics-assembly
112+
File: ossm-metrics
113113
- Name: Distributed tracing and Service Mesh
114114
Dir: traces
115115
Topics:
116116
- Name: Configuring distributed tracing with Service Mesh
117-
File: ossm-distr-tracing-assembly
117+
File: ossm-distr-tracing
118118
- Name: Kiali Operator provided by Red Hat
119119
Dir: kiali
120120
Topics:
121121
- Name: Using Kiali Operator provided by Red Hat
122-
File: ossm-kiali-assembly
122+
File: ossm-kiali
123123
- Name: Using OpenShift Service Mesh Console plugin
124124
File: ossm-console-plugin
125125
---

about/ossm-about-concepts-assembly.adoc renamed to about/ossm-about-concepts.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
:_content-type: ASSEMBLY
2-
[id="ossm-understanding-service-mesh-assembly"]
2+
[id="ossm-understanding-service-mesh"]
33
= Understanding OpenShift Service Mesh
44
include::_attributes/common-attributes.adoc[]
5-
:context: ossm-about-concepts-assembly
5+
:context: ossm-about-concepts
66

77
toc::[]
88

install/ossm-cert-manager-assembly.adoc renamed to install/ossm-cert-manager.adoc

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
:_mod-docs-content-type: ASSEMBLY
2-
[id="ossm-cert-manager-assembly"]
2+
[id="ossm-cert-manager"]
33
= OpenShift Service Mesh and cert-manager
44
include::_attributes/common-attributes.adoc[]
5-
:context: ossm-cert-manager-assembly
5+
:context: ossm-cert-manager
66

7-
//Working IA. The IA for 3.x is influx. Putting in "Installing" for now as most of the content relates to installing cert-manager, istio-csr, and then creating and installing the Istio resource.
8-
//TP1 content. Likely structure, titles, content, etc will change for GA
97
//User must install cert-manager before they create and install an Istio resource. However, the spec.updateStrategy they decide on for the Istio resource dictates specific steps istio-csr and cert-manager, esp in regards to how istio-csr and cert-manager are updated.
108

119
toc::[]
@@ -25,13 +23,13 @@ include::modules/ossm-installing-cert-manager.adoc[leveloffset=+1]
2523
.Next steps
2624
To install `istio-csr`, you must follow the `istio-csr` installation instructions for the type of update strategy you want. By default, `spec.updateStrategy` is set to `InPlace` when you create and install your `Istio` resource. You create and install your `Istio` resource after you install `istio-csr`.
2725

28-
* xref:../install/ossm-cert-manager-assembly.adoc#inplace-istio-csr-installation_ossm-cert-manager-assembly[Installing the istio-csr agent by using the in place update strategy]
29-
* xref:../install/ossm-cert-manager-assembly.adoc#revision-based-istio-csr-installation_ossm-cert-manager-assembly[Installing the istio-csr agent by using the revision based update strategy]
26+
* xref:../install/ossm-cert-manager.adoc#inplace-istio-csr-installation_ossm-cert-manager[Installing the istio-csr agent by using the in place update strategy]
27+
* xref:../install/ossm-cert-manager.adoc#revision-based-istio-csr-installation_ossm-cert-manager[Installing the istio-csr agent by using the revision based update strategy]
3028
3129
include::modules/ossm-cert-manager-istio-csr-inplace-update-strategy.adoc[leveloffset=+2]
3230

3331
.Next steps
34-
* xref:../install/ossm-cert-manager-assembly.adoc#installing-istio-resource_ossm-cert-manager-assembly[Installing your Istio resource]
32+
* xref:../install/ossm-cert-manager.adoc#installing-istio-resource_ossm-cert-manager[Installing your Istio resource]
3533
3634
include::modules/ossm-cert-manager-istio-csr-revisionbased-strategy.adoc[leveloffset=+2]
3735

@@ -41,7 +39,7 @@ include::modules/ossm-cert-manager-istio-csr-revisionbased-strategy.adoc[levelof
4139
4240
4341
.Next steps
44-
* xref:../install/ossm-cert-manager-assembly.adoc#installing-istio-resource_ossm-cert-manager-assembly[Installing your Istio resource]
42+
* xref:../install/ossm-cert-manager.adoc#installing-istio-resource_ossm-cert-manager[Installing your Istio resource]
4543
4644
include::modules/ossm-cert-manager-installing-istio-resource.adoc[leveloffset=+2]
4745
include::modules/ossm-cert-manager-verifying-install.adoc[leveloffset=+2]

install/ossm-sidecar-injection-assembly.adoc renamed to install/ossm-sidecar-injection.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[id="ossm-sidecar-injection"]
33
= Sidecar injection
44
include::_attributes/common-attributes.adoc[]
5-
:context: ossm-sidecar-injection-assembly
5+
:context: ossm-sidecar-injection
66

77
toc::[]
88

migrating/checklists/ossm-migrating-premigration-checklists.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,4 @@ There are some configurations you must complete first before you can start migra
123123
[id="additional-resources-checklists_{context}"]
124124
== Additional resources
125125

126-
* xref:../../observability/kiali/ossm-kiali-assembly.adoc[Using {kialiproduct}]
126+
* xref:../../observability/kiali/ossm-kiali.adoc#ossm-kiali[Using {kialiproduct}]

migrating/checklists/ossm-migrating-read-me.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ You can set `updateStrategy` to `RevisionBased` to use canary updates.
3636
3737
Be aware that setting the `updateStrategy` to `RevisionBased` also has implications for some integrations with {SMProduct}, such as the cert-manager tool integration.
3838

39-
* xref:../../install/ossm-cert-manager-assembly.adoc#updating-istio-csr-revision-based-only_ossm-cert-manager-assembly[Updating istio-csr agents with revision-based update strategies]
39+
* xref:../../install/ossm-cert-manager.adoc#updating-istio-csr-revision-based-only_ossm-cert-manager[Updating istio-csr agents with revision-based update strategies]
4040
4141
include::modules/ossm-migrating-read-me-supported-multi-cluster-topologies.adoc[leveloffset=+1]
4242
include::modules/ossm-migrating-read-me-support-for-istioctl.adoc[leveloffset=+1]

migrating/cluster-wide/ossm-migrating-cluster-wide.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ include::modules/ossm-control-plane-configuration-migration-requirements.adoc[le
2323
[id="additional-resources-cluster-wide_{context}"]
2424
.Additional resources
2525

26-
* xref:../../install/ossm-sidecar-injection-assembly.adoc#ossm-about-sidecar-injection_ossm-sidecar-injection-assembly[About sidecar injection]
26+
* xref:../../install/ossm-sidecar-injection.adoc#ossm-about-sidecar-injection_ossm-sidecar-injection[About sidecar injection]
2727
2828
* xref:../../migrating/checklists/ossm-migrating-network-policies.adoc#ossm-migrating-network-policies-setup-during-migration_ossm-migrating-network-policies[Set up network policies to use during migration]
2929
@@ -133,4 +133,4 @@ If you are not using gateways, you can complete your migration.
133133
[id="additional-resources_{context}"]
134134
== Additional resources
135135

136-
* xref:../../install/ossm-sidecar-injection-assembly.adoc#ossm-identifying-revision-name_ossm-sidecar-injection-assembly[Identifying the revision name]
136+
* xref:../../install/ossm-sidecar-injection.adoc#ossm-identifying-revision-name_ossm-sidecar-injection[Identifying the revision name]

migrating/reference/ossm-migrating-references.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ include::modules/ossm-migrating-reference-unsupported-configurations.adoc[levelo
1414
[id="additional-resources-reference_{context}"]
1515
== Additional Resources
1616

17-
* xref:../../observability/ossm-observability-service-mesh-assembly.adoc[Observability and Service Mesh]
17+
* xref:../../observability/ossm-observability-service-mesh.adoc#ossm-observability-service-mesh[Observability and Service Mesh]
1818

1919
//* add exref to "Deploying multiple service meshes on a single cluster"
2020
//exrefs handled by OSSM-8852

modules/ossm-about-cert-manager.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * service-mesh-docs-main/install/ossm-cert-manager-assembly.adoc
3+
// * service-mesh-docs-main/install/ossm-cert-manager.adoc
44

55
:_mod-docs-content-type: CONCEPT
66
[id="ossm-cert-manager-integration-istio_{context}"]

modules/ossm-about-concepts-argo-rollouts.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Module included in the following assemblies:
2-
// about/ossm-about-concepts-assembly.adoc
2+
// about/ossm-about-concepts.adoc
33

44
:_mod-docs-content-type: CONCEPT
55
[id="ossm-about-concepts-argo-rollouts_{context}"]

0 commit comments

Comments
 (0)