Skip to content

Commit 242db92

Browse files
authored
Merge pull request #87432 from bhardesty/osdocs-12565-service-mesh
OSDOCS-12565: Add Service Mesh to ROSA HCP
2 parents c05b257 + 5313931 commit 242db92

37 files changed

+288
-188
lines changed

_topic_maps/_topic_map_rosa.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1729,6 +1729,12 @@ Name: Service Mesh
17291729
Dir: service_mesh
17301730
Distros: openshift-rosa
17311731
Topics:
1732+
# Tech Preview
1733+
# - Name: Service Mesh 3.x
1734+
# Dir: v3x
1735+
# Topics:
1736+
# - Name: OpenShift Service Mesh 3.0 TP1 overview
1737+
# File: ossm-service-mesh-3-0-overview
17321738
- Name: Service Mesh 2.x
17331739
Dir: v2x
17341740
Topics:

_topic_maps/_topic_map_rosa_hcp.yml

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -904,6 +904,100 @@ Topics:
904904
# - Name: Adding worker nodes to single-node OpenShift clusters
905905
# File: nodes-sno-worker-nodes
906906
---
907+
Name: Service Mesh
908+
Dir: service_mesh
909+
Distros: openshift-rosa-hcp
910+
Topics:
911+
# Tech Preview
912+
# - Name: Service Mesh 3.x
913+
# Dir: v3x
914+
# Topics:
915+
# - Name: OpenShift Service Mesh 3.0 TP1 overview
916+
# File: ossm-service-mesh-3-0-overview
917+
- Name: Service Mesh 2.x
918+
Dir: v2x
919+
Topics:
920+
- Name: About OpenShift Service Mesh
921+
File: ossm-about
922+
- Name: Service Mesh 2.x release notes
923+
File: servicemesh-release-notes
924+
- Name: Service Mesh architecture
925+
File: ossm-architecture
926+
- Name: Service Mesh deployment models
927+
File: ossm-deployment-models
928+
- Name: Service Mesh and Istio differences
929+
File: ossm-vs-community
930+
- Name: Preparing to install Service Mesh
931+
File: preparing-ossm-installation
932+
- Name: Installing the Operators
933+
File: installing-ossm
934+
- Name: Creating the ServiceMeshControlPlane
935+
File: ossm-create-smcp
936+
- Name: Adding workloads to a service mesh
937+
File: ossm-create-mesh
938+
- Name: Enabling sidecar injection
939+
File: prepare-to-deploy-applications-ossm
940+
- Name: Upgrading Service Mesh
941+
File: upgrading-ossm
942+
- Name: Managing users and profiles
943+
File: ossm-profiles-users
944+
- Name: Security
945+
File: ossm-security
946+
- Name: Traffic management
947+
File: ossm-traffic-manage
948+
- Name: Metrics, logs, and traces
949+
File: ossm-observability
950+
- Name: Performance and scalability
951+
File: ossm-performance-scalability
952+
- Name: Deploying to production
953+
File: ossm-deploy-production
954+
- Name: Federation
955+
File: ossm-federation
956+
- Name: Extensions
957+
File: ossm-extensions
958+
- Name: 3scale WebAssembly for 2.1
959+
File: ossm-threescale-webassembly-module
960+
- Name: 3scale Istio adapter for 2.0
961+
File: threescale-adapter
962+
- Name: Troubleshooting Service Mesh
963+
File: ossm-troubleshooting-istio
964+
- Name: Control plane configuration reference
965+
File: ossm-reference-smcp
966+
- Name: Kiali configuration reference
967+
File: ossm-reference-kiali
968+
- Name: Jaeger configuration reference
969+
File: ossm-reference-jaeger
970+
- Name: Uninstalling Service Mesh
971+
File: removing-ossm
972+
# Service Mesh 1.x is tech preview
973+
# - Name: Service Mesh 1.x
974+
# Dir: v1x
975+
# Topics:
976+
# - Name: Service Mesh 1.x release notes
977+
# File: servicemesh-release-notes
978+
# - Name: Service Mesh architecture
979+
# File: ossm-architecture
980+
# - Name: Service Mesh and Istio differences
981+
# File: ossm-vs-community
982+
# - Name: Preparing to install Service Mesh
983+
# File: preparing-ossm-installation
984+
# - Name: Installing Service Mesh
985+
# File: installing-ossm
986+
# - Name: Security
987+
# File: ossm-security
988+
# - Name: Traffic management
989+
# File: ossm-traffic-manage
990+
# - Name: Deploying applications on Service Mesh
991+
# File: prepare-to-deploy-applications-ossm
992+
# - Name: Data visualization and observability
993+
# File: ossm-observability
994+
# - Name: Custom resources
995+
# File: ossm-custom-resources
996+
# - Name: 3scale Istio adapter for 1.x
997+
# File: threescale-adapter
998+
# - Name: Removing Service Mesh
999+
# File: removing-ossm
1000+
---
9071001
Name: Serverless
9081002
Dir: serverless
9091003
Distros: openshift-rosa-hcp

modules/distr-tracing-config-storage.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ spec:
645645
<3> Secret which defines environment variables ES_PASSWORD and ES_USERNAME. Created by kubectl create secret generic tracing-secret --from-literal=ES_PASSWORD=changeme --from-literal=ES_USERNAME=elastic
646646
<4> Volume mounts and volumes which are mounted into all storage components.
647647

648-
ifndef::openshift-rosa,openshift-dedicated[]
648+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
649649
[id="distr-tracing-manage-es-certificates_{context}"]
650650
= Managing certificates with Elasticsearch
651651

@@ -722,4 +722,4 @@ spec:
722722
The {JaegerName} Operator sets the Elasticsearch custom resource `name` to the value of `spec.storage.elasticsearch.name` from the Jaeger custom resource when provisioning Elasticsearch.
723723

724724
The certificates are provisioned by the {es-op} and the {JaegerName} Operator injects the certificates.
725-
endif::openshift-rosa,openshift-dedicated[]
725+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]

modules/ossm-about-smcp.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ The control plane includes Istiod, Ingress and Egress Gateways, and other compon
1212
This basic installation is configured based on the default {product-title} settings and is not designed for production use. Use this default installation to verify your installation, and then configure your `ServiceMeshControlPlane` settings for your environment.
1313
====
1414

15-
ifndef::openshift-rosa,openshift-dedicated[]
15+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1616
[NOTE]
1717
====
1818
The {SMProductShortName} documentation uses `istio-system` as the example project, but you can deploy the service mesh to any project.
1919
====
20-
endif::openshift-rosa,openshift-dedicated[]
20+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
2121

22-
ifdef::openshift-rosa[]
22+
ifdef::openshift-rosa,openshift-rosa-hcp[]
2323
If you are deploying the control plane for use on {product-rosa}, see the Red Hat Knowledgebase article link:https://access.redhat.com/solutions/6529231[OpenShift service mesh operator Istio basic not starting due to authentication errors], which discusses adding a new project and starting pods.
24-
endif::openshift-rosa[]
24+
endif::openshift-rosa,openshift-rosa-hcp[]
2525
ifdef::openshift-dedicated[]
2626
If you are deploying the control plane for use on {product-dedicated}, see the Red Hat Knowledgebase article link:https://access.redhat.com/solutions/6529231[OpenShift service mesh operator Istio basic not starting due to authentication errors], which discusses adding a new project and starting pods.
2727
endif::openshift-dedicated[]

modules/ossm-add-project-using-label-selectors-cli.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ You can use label selectors to add a project to the {SMProductShortName} with th
1111
.Prerequisites
1212
* You have installed the {SMProductName} Operator.
1313
* The deployment has an existing `ServiceMeshMemberRoll` resource.
14-
ifndef::openshift-rosa,openshift-dedicated[]
14+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1515
* You are logged in to {product-title} as`cluster-admin`.
16-
endif::openshift-rosa,openshift-dedicated[]
17-
ifdef::openshift-rosa,openshift-dedicated[]
16+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
17+
ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1818
* You are logged in to {product-title} as a user with the `dedicated-admin` role.
19-
endif::openshift-rosa,openshift-dedicated[]
19+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
2020
2121
.Procedure
2222

modules/ossm-add-project-using-label-selectors-console.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ You can use labels selectors to add a project to the {SMProductShortName} with t
1111
.Prerequisites
1212
* You have installed the {SMProductName} Operator.
1313
* The deployment has an existing `ServiceMeshMemberRoll` resource.
14-
ifndef::openshift-rosa,openshift-dedicated[]
14+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1515
* You are logged in to the {product-title} web console as `cluster-admin`.
16-
endif::openshift-rosa,openshift-dedicated[]
17-
ifdef::openshift-rosa,openshift-dedicated[]
16+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
17+
ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1818
* You are logged in to the {product-title} web console as a user with the `dedicated-admin` role.
19-
endif::openshift-rosa,openshift-dedicated[]
19+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
2020
2121
.Procedure
2222

modules/ossm-configuring-the-threescale-wasm-auth-module.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ Configuring the WebAssembly extension is currently a manual process. Support for
2525

2626
* Identify a Kubernetes workload and namespace on your {SMProductShortName} deployment that you will apply this module.
2727
* You must have a 3scale tenant account. See link:https://www.3scale.net/signup[SaaS] or link:https://access.redhat.com/documentation/en-us/red_hat_3scale_api_management/2.11/html-single/installing_3scale/index#install-threescale-on-openshift-guide[3scale 2.11 On-Premises] with a matching service and relevant applications and metrics defined.
28-
ifndef::openshift-rosa,openshift-dedicated[]
28+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
2929
* If you apply the module to the `<product_page>` microservice in the `bookinfo` namespace, see the xref:../../service_mesh/v1x/prepare-to-deploy-applications-ossm.adoc#ossm-tutorial-bookinfo-overview_deploying-applications-ossm-v1x[Bookinfo sample application].
30-
endif::openshift-rosa,openshift-dedicated[]
30+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
3131
** The following example is the YAML format for the custom resource for `threescale-wasm-auth` module.
3232
This example refers to the upstream Maistra version of {SMProductShortName}, `WasmPlugin` API. You must declare the namespace where the `threescale-wasm-auth` module is deployed, alongside a `selector` to identify the set of applications the module will apply to:
3333
+

modules/ossm-control-plane-cli.adoc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ You can deploy a basic `ServiceMeshControlPlane` from the command line.
1313

1414
* The {SMProductName} Operator must be installed.
1515
* Access to the OpenShift CLI (`oc`).
16-
ifndef::openshift-rosa,openshift-dedicated[]
16+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1717
* You are logged in to {product-title} as`cluster-admin`.
18-
endif::openshift-rosa,openshift-dedicated[]
19-
ifdef::openshift-rosa,openshift-dedicated[]
18+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
19+
ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
2020
* You are logged in to {product-title} as a user with the `dedicated-admin` role.
21-
endif::openshift-rosa,openshift-dedicated[]
21+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
2222
2323
.Procedure
2424

@@ -29,11 +29,11 @@ endif::openshift-rosa,openshift-dedicated[]
2929
$ oc new-project istio-system
3030
----
3131
+
32-
ifdef::openshift-rosa,openshift-dedicated[]
32+
ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
3333
The `ServiceMeshControlPlane` resource must be installed in the `istio-system` project, separate from your microservices and Operators.
34-
endif::openshift-rosa,openshift-dedicated[]
34+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
3535

36-
ifndef::openshift-rosa,openshift-dedicated[]
36+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
3737
. Create a `ServiceMeshControlPlane` file named `istio-installation.yaml` using the following example. The version of the {SMProductShortName} control plane determines the features available regardless of the version of the Operator.
3838
+
3939
.Example version {MaistraVersion} istio-installation.yaml
@@ -56,8 +56,8 @@ spec:
5656
grafana:
5757
enabled: true
5858
----
59-
endif::openshift-rosa,openshift-dedicated[]
60-
ifdef::openshift-rosa,openshift-dedicated[]
59+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
60+
ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
6161
. Create a `ServiceMeshControlPlane` file named `istio-installation.yaml` using the following example. The version of the {SMProductShortName} control plane determines the features available regardless of the version of the Operator.
6262
+
6363
.Example `ServiceMeshControlPlane` resource
@@ -88,13 +88,13 @@ spec:
8888
telemetry:
8989
type: Istiod
9090
----
91-
ifdef::openshift-rosa[]
91+
ifdef::openshift-rosa,openshift-rosa-hcp[]
9292
<1> Specifies a required setting for {product-rosa}.
93-
endif::openshift-rosa[]
93+
endif::openshift-rosa,openshift-rosa-hcp[]
9494
ifdef::openshift-dedicated[]
9595
<1> Specifies a required setting for {product-dedicated}.
9696
endif::openshift-dedicated[]
97-
endif::openshift-rosa,openshift-dedicated[]
97+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
9898
+
9999
. Run the following command to deploy the {SMProductShortName} control plane, where `<istio_installation.yaml>` includes the full path to your file.
100100
+

modules/ossm-control-plane-web.adoc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ You can deploy a basic `ServiceMeshControlPlane` by using the web console. In t
1111
.Prerequisites
1212

1313
* The {SMProductName} Operator must be installed.
14-
ifndef::openshift-rosa,openshift-dedicated[]
14+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1515
* You are logged in to the {product-title} web console as `cluster-admin`.
16-
endif::openshift-rosa,openshift-dedicated[]
17-
ifdef::openshift-rosa,openshift-dedicated[]
16+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
17+
ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1818
* You are logged in to the {product-title} web console as a user with the `dedicated-admin` role.
19-
endif::openshift-rosa,openshift-dedicated[]
19+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
2020
2121
.Procedure
2222

@@ -27,16 +27,16 @@ endif::openshift-rosa,openshift-dedicated[]
2727
.. Navigate to *Home* -> *Projects*.
2828
+
2929
.. Click *Create Project*.
30-
ifndef::openshift-rosa,openshift-dedcated[]
30+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedcated[]
3131
+
3232
.. In the *Name* field, enter `istio-system`. The `ServiceMeshControlPlane` resource must be installed in a project that is separate from your microservices and Operators.
3333
+
3434
These steps use `istio-system` as an example, but you can deploy your {SMProductShortName} control plane in any project as long as it is separate from the project that contains your services.
35-
endif::openshift-rosa,openshift-dedcated[]
36-
ifdef::openshift-rosa,openshift-dedcated[]
35+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedcated[]
36+
ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedcated[]
3737
+
3838
.. In the *Name* field, enter `istio-system`. The `ServiceMeshControlPlane` resource must be installed in the `istio-system` project, separate from your microservices and Operators.
39-
endif::openshift-rosa,openshift-dedcated[]
39+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedcated[]
4040
+
4141
.. Click *Create*.
4242

@@ -49,9 +49,9 @@ endif::openshift-rosa,openshift-dedcated[]
4949
--
5050
.. Accept the default {SMProductShortName} control plane version to take advantage of the features available in the most current version of the product. The version of the control plane determines the features available regardless of the version of the Operator.
5151

52-
ifdef::openshift-rosa[]
52+
ifdef::openshift-rosa,openshift-rosa-hcp[]
5353
.. Add the `spec.security.identity.type.ThirdParty` field, required by {product-rosa}.
54-
endif::openshift-rosa[]
54+
endif::openshift-rosa,openshift-rosa-hcp[]
5555
ifdef::openshift-dedicated[]
5656
.. Add the `spec.security.identity.type.ThirdParty` field, required by {product-dedicated}.
5757
endif::openshift-dedicated[]

modules/ossm-deploy-cluster-wide-control-plane-cli.adoc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ You can configure the `ServiceMeshControlPlane` resource for cluster-wide deploy
1313

1414
* The {SMProductName} Operator is installed.
1515
* You have access to the OpenShift CLI (`oc`).
16-
ifndef::openshift-rosa,openshift-dedicated[]
16+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1717
* You are logged in to {product-title} as`cluster-admin`.
18-
endif::openshift-rosa,openshift-dedicated[]
19-
ifdef::openshift-rosa,openshift-dedicated[]
18+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
19+
ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
2020
* You are logged in to {product-title} as a user with the `dedicated-admin` role.
21-
endif::openshift-rosa,openshift-dedicated[]
21+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
2222
2323
.Procedure
2424

@@ -31,7 +31,7 @@ $ oc new-project istio-system
3131

3232
. Create a `ServiceMeshControlPlane` file named `istio-installation.yaml` using the following example:
3333
+
34-
ifndef::openshift-rosa,openshift-dedicated[]
34+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
3535
.Example version {MaistraVersion} istio-installation.yaml
3636
[source,yaml, subs="attributes,verbatim"]
3737
----
@@ -44,8 +44,8 @@ spec:
4444
version: v{MaistraVersion}
4545
mode: ClusterWide
4646
----
47-
endif::openshift-rosa,openshift-dedicated[]
48-
ifdef::openshift-rosa,openshift-dedicated[]
47+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
48+
ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
4949
.Example `ServiceMeshControlPlane` resource
5050
[source,yaml, subs="attributes,verbatim"]
5151
----
@@ -62,13 +62,13 @@ spec:
6262
type: ThirdParty <2>
6363
----
6464
<1> Specifies that the resource is for a cluster-wide deployment.
65-
ifdef::openshift-rosa[]
65+
ifdef::openshift-rosa,openshift-rosa-hcp[]
6666
<2> Specifies a required setting for {product-rosa}.
67-
endif::openshift-rosa[]
67+
endif::openshift-rosa,openshift-rosa-hcp[]
6868
ifdef::openshift-dedicated[]
6969
<2> Specifies a required setting for {product-dedicated}.
7070
endif::openshift-dedicated[]
71-
endif::openshift-rosa,openshift-dedicated[]
71+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
7272

7373
. Run the following command to deploy the {SMProductShortName} control plane:
7474
+

0 commit comments

Comments
 (0)