Skip to content

Commit bdb8232

Browse files
authored
Merge pull request #44836 from rh-tokeefe/OSSMDOC-557
OSSMDOC-557: update supported config topic
2 parents 0df5db0 + bc4a532 commit bdb8232

9 files changed

+17
-18
lines changed

modules/ossm-config-enabling-controlplane.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Secure connections are always used when proxies communicate with the control pla
1212
apiVersion: maistra.io/v2
1313
kind: ServiceMeshControlPlane
1414
spec:
15-
version: v2.0
15+
version: v2.1
1616
security:
1717
controlPlane:
1818
mtls: true

modules/ossm-config-sec-mtls-mesh.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ If your workloads do not communicate with outside services, you can quickly enab
1313
apiVersion: maistra.io/v2
1414
kind: ServiceMeshControlPlane
1515
spec:
16-
version: v2.0
16+
version: v2.1
1717
security:
1818
dataPlane:
1919
mtls: true

modules/ossm-control-plane-cli.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ $ oc new-project istio-system
3131
+
3232
. Create a `ServiceMeshControlPlane` file named `istio-installation.yaml` using the following example. The version of the control plane determines the features available regardless of the version of the Operator.
3333
+
34-
.Example version 2.0 istio-installation.yaml
34+
.Example version 2.1 istio-installation.yaml
3535
[source,yaml]
3636
----
3737
apiVersion: maistra.io/v2
@@ -40,7 +40,7 @@ metadata:
4040
name: basic
4141
namespace: istio-system
4242
spec:
43-
version: v2.0
43+
version: v2.1
4444
tracing:
4545
type: Jaeger
4646
sampling: 10000

modules/ossm-cr-tracing.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ kind: ServiceMeshControlPlane
1515
metadata:
1616
name: basic
1717
spec:
18-
version: v2.0
18+
version: v2.1
1919
tracing:
2020
sampling: 100
2121
type: Jaeger

modules/ossm-deploying-jaeger.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ kind: ServiceMeshControlPlane
3838
metadata:
3939
name: basic
4040
spec:
41-
version: v2.0
41+
version: v2.1
4242
tracing:
4343
sampling: 10000
4444
type: Jaeger
@@ -63,7 +63,7 @@ kind: ServiceMeshControlPlane
6363
metadata:
6464
name: basic
6565
spec:
66-
version: v2.0
66+
version: v2.1
6767
tracing:
6868
sampling: 10000
6969
type: Jaeger
@@ -98,7 +98,7 @@ kind: ServiceMeshControlPlane
9898
metadata:
9999
name: basic
100100
spec:
101-
version: v2.0
101+
version: v2.1
102102
tracing:
103103
sampling: 1000
104104
type: Jaeger
@@ -125,7 +125,7 @@ kind: ServiceMeshControlPlane
125125
metadata:
126126
name: basic
127127
spec:
128-
version: v2.0
128+
version: v2.1
129129
tracing:
130130
sampling: 1000
131131
type: Jaeger

modules/ossm-enabling-jaeger.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ kind: ServiceMeshControlPlane
1616
metadata:
1717
name: basic
1818
spec:
19-
version: v2.0
19+
version: v2.1
2020
tracing:
2121
sampling: 100
2222
type: Jaeger

modules/ossm-recommended-resources.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ The settings in the following example are based on 1,000 services and 1,000 requ
2525
+
2626
.. Set the values for `spec.proxy.runtime.container.resources.requests.cpu` and `spec.proxy.runtime.container.resources.requests.memory` in your `ServiceMeshControlPlane` resource.
2727
+
28-
.Example version 2.0 ServiceMeshControlPlane
28+
.Example version 2.1 ServiceMeshControlPlane
2929
[source,yaml]
3030
----
3131
apiVersion: maistra.io/v2
@@ -34,7 +34,7 @@ metadata:
3434
name: basic
3535
namespace: istio-system
3636
spec:
37-
version: v2.0
37+
version: v2.1
3838
proxy:
3939
runtime:
4040
container:

modules/ossm-smcp-prod.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ kind: ServiceMeshControlPlane
2424
metadata:
2525
name: basic
2626
spec:
27-
version: v2.0
27+
version: v2.1
2828
tracing:
2929
sampling: 100
3030
type: Jaeger

modules/ossm-supported-configurations.adoc

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
The following configurations are supported for the current release of {SMProductName}:
1111

12-
* Red Hat {product-title} version 4.x.
12+
* Red Hat {product-title} version 4.9 or later.
1313
* Red Hat {product-dedicated} version 4.
1414
* Azure Red Hat OpenShift version 4.
1515

@@ -45,8 +45,7 @@ For additional information about {SMProductName} lifecycle and supported configu
4545

4646
* Jaeger agent as a sidecar is the only supported configuration for Jaeger. Jaeger as a daemonset is not supported for multitenant installations or OpenShift Dedicated.
4747

48-
[id="ossm-supported-configurations-adapters_{context}"]
49-
== Supported Mixer adapters
48+
[id="ossm-supported-configurations-webassembly_{context}"]
49+
== Supported WebAssembly module
5050

51-
* This release only supports the following Mixer adapter:
52-
** 3scale Istio Adapter
51+
* 3scale WebAssembly is the only provided WebAssembly module. You can create custom WebAssembly modules.

0 commit comments

Comments
 (0)