Skip to content

Commit 7685222

Browse files
authored
Merge pull request #97140 from openshift-cherrypick-robot/cherry-pick-96787-to-service-mesh-docs-3.1
[service-mesh-docs-3.1] OSSM-9881 Update version support table for 3.1
2 parents 8974293 + 9ed432d commit 7685222

File tree

5 files changed

+39
-12
lines changed

5 files changed

+39
-12
lines changed

_attributes/common-attributes.adoc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
:SMProductName: Red{nbsp}Hat OpenShift Service Mesh
1818
:SMProduct: OpenShift Service Mesh
1919
:SMProductShortName: Service Mesh
20-
:SMProductVersion: 3.0.3
20+
:SMProductVersion: 3.1.0
2121
//service mesh v2
2222
//Update when there is a new 2.6.z release
2323
:SMv2Version: 2.6.7
2424
//SMv2Version must be updated with each 2.x release because users can only migrate from the latest 2.x.z version. Update 02/24/2025 for service-mesh-docs-3.0
2525
//Istio
2626
:istio: Istio
27-
:istio-latest: 1.24.6
27+
:istio-latest: 1.26.2
2828
//update istio-latest as necessary
2929
//Kiali Operator
3030
:KialiProduct: Kiali Operator provided by Red{nbsp}Hat
@@ -101,9 +101,6 @@
101101
//Version-agnostic OLM
102102
:olm-first: Operator Lifecycle Manager (OLM)
103103
:olm: OLM
104-
//service mesh v2
105-
:SMProductVersion: 3.0.3
106-
:MaistraVersion: 3.0
107104
//Jaeger
108105
//Deprecated
109106
:JaegerName: Red{nbsp}Hat OpenShift distributed tracing platform (Jaeger)

install/ossm-supported-platforms-configurations.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ Before you can install {SMProductName} {SMProductVersion}, you must subscribe to
1111
[id="ossm-supported-platforms_{context}"]
1212
== Supported platforms
1313

14-
Version {MaistraVersion} {SMProductShortName} control planes are supported on the following platform versions:
14+
The following platform versions support {SMProductShortName} control plane version {SMProductVersion}:
1515

1616
ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
17-
* Red Hat OpenShift Container Platform version 4.14 or later
17+
* Red Hat OpenShift Container Platform version 4.16 or later
1818
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1919
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
20-
* Red Hat {ocp-product-title} version 4.14 or later
20+
* Red Hat {ocp-product-title} version 4.16 or later
2121
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
2222
* {product-dedicated} version 4
2323
* Azure Red Hat OpenShift (ARO) version 4

modules/ossm-release-notes-3-1-new-features-enhancements.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[id="ossm-release-3-1-new-features-enhancements_{context}"]
77
= {SMProductName} version 3.1 new features and enhancements
88

9-
This release makes {SMProductName} 3.1 generally available, adds new features, addresses Common Vulnerabilities and Exposures (CVEs), and is supported on {ocp-product-title} 4.14 and later.
9+
This release makes {SMProductName} 3.1 generally available, adds new features, addresses Common Vulnerabilities and Exposures (CVEs), and is supported on {ocp-product-title} 4.16 and later.
1010

1111
For a list of supported component versions and support features, see "Service Mesh 3.0 feature support tables".
1212

modules/ossm-release-notes-supported-versions.adoc

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,34 @@
66
[id="ossm-release-notes-supported-versions_{context}"]
77
= {SMProduct} supported versions
88

9+
See the following table for information about {SMProduct} 3.1.0 supported versions.
10+
11+
== {SMProduct} 3.1.0 supported versions
12+
13+
[cols="1,1"]
14+
|===
15+
| Feature | Supported versions
16+
17+
|{SMProduct} 3 Operator
18+
|3.1.0
19+
20+
|{SMProduct} `Istio` control plane resource
21+
|1.26.2
22+
23+
|{ocp-product-title}
24+
|4.16 and later
25+
26+
| Envoy proxy
27+
| 1.34.2
28+
29+
| `IstioCNI` resource
30+
| 1.26.2
31+
32+
|Kiali Operator
33+
|2.11.1
34+
35+
|===
36+
937
See the following table for information about {SMProduct} 3.0.3 supported versions.
1038

1139
== {SMProduct} 3.0.3 supported versions
@@ -84,16 +112,16 @@ See the following table for information about {SMProduct} 3.0.1 supported versio
84112
| 1.24.4 ^[1]^
85113
|===
86114

87-
See the following table for information about {SMProduct} 3 supported versions.
115+
See the following table for information about {SMProduct} 3.0.0 supported versions.
88116

89-
== {SMProduct} 3.0 supported versions
117+
== {SMProduct} 3.0.0 supported versions
90118

91119
[cols="1,1"]
92120
|===
93121
| Feature | Supported versions
94122

95123
|{SMProduct} 3 Operator
96-
|3.0
124+
|3.0.0
97125

98126
|{SMProduct} `Istio` control plane resource
99127
|1.24.3

observability/kiali/ossm-console-plugin.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ You can install the {SMPluginShort} with the Kiali Operator by creating a `OSSMC
2020
|===
2121
|OSSM version |Kiali Server version |OSSMC plugin version |OCP version
2222

23+
|3.1 |v2.11 |v2.11 |4.16+
24+
2325
|3.0 |v2.4 |v2.4 |4.15+
2426

2527
|2.6 |v1.73 |v1.73 |4.15-4.18

0 commit comments

Comments
 (0)