Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions _topic_map.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2709,6 +2709,8 @@ Topics:
File: ossm-create-mesh
- Name: Enabling sidecar injection
File: prepare-to-deploy-applications-ossm
- Name: Upgrading from 2.0 to 2.1
File: upgrading-ossm-to-2-1
- Name: Upgrading from 1.1 to 2.0
File: upgrading-ossm
- Name: Managing users and profiles
Expand All @@ -2723,6 +2725,8 @@ Topics:
File: ossm-performance-scalability
- Name: Deploying to production
File: ossm-deploy-production
- Name: Federation
File: ossm-federation
- Name: Extensions
File: ossm-extensions
- Name: Using the 3scale Istio adapter
Expand All @@ -2742,6 +2746,8 @@ Topics:
File: servicemesh-release-notes
- Name: Service Mesh architecture
File: ossm-architecture
- Name: Service Mesh deployment models
File: ossm-deployment-models
- Name: Service Mesh and Istio differences
File: ossm-vs-community
- Name: Preparing to install Service Mesh
Expand Down
20 changes: 20 additions & 0 deletions service_mesh/v2x/ossm-federation.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,30 @@ include::modules/ossm-federation-features.adoc[leveloffset=+2]

include::modules/ossm-federation-security.adoc[leveloffset=+2]

include::modules/ossm-federation-limitations.adoc[leveloffset=+2]

include::modules/ossm-federation-prerequisites.adoc[leveloffset=+2]

include::modules/ossm-federation-planning.adoc[leveloffset=+2]

include::modules/ossm-federation-across-cluster.adoc[leveloffset=+2]

include::modules/ossm-federation-checklist.adoc[leveloffset=+2]

include::modules/ossm-federation-config-smcp.adoc[leveloffset=+2]

include::modules/ossm-federation-config-meshPeer.adoc[leveloffset=+2]

include::modules/ossm-federation-create-meshPeer.adoc[leveloffset=+3]

include::modules/ossm-federation-config-export.adoc[leveloffset=+2]

include::modules/ossm-federation-create-export.adoc[leveloffset=+3]

include::modules/ossm-federation-config-import.adoc[leveloffset=+2]

include::modules/ossm-federation-create-import.adoc[leveloffset=+3]

include::modules/ossm-federation-remove-service.adoc[leveloffset=+2]

include::modules/ossm-federation-remove-mesh.adoc[leveloffset=+2]
11 changes: 7 additions & 4 deletions service_mesh/v2x/upgrading-ossm-to-2-1.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[id="ossm-upgrade-to-2-1"]
[id="upgrading-ossm-to-2-1"]
= Upgrading {ProductName} from version 2.0 to version 2.1
include::modules/ossm-document-attributes.adoc[]
:context: oossm-upgrading-to-2-1
:context: upgrading-ossm-to-2-1

toc::[]

Expand Down Expand Up @@ -35,8 +35,11 @@ $ oc project istio-system
----
$ oc get smcp -o yaml
----

TIP: Back up your control plane configuration.
+
[TIP]
====
Back up your control plane configuration.
====

. Update the `.spec.version` field from v2.0 to v2.1, and apply the configuration.
+
Expand Down