Skip to content

Commit bb31a99

Browse files
authored
Merge pull request #99758 from openshift-cherrypick-robot/cherry-pick-99682-to-enterprise-4.20
[enterprise-4.20] OSSM-10913 2.6.11 (At Stage): [DOC] Release Notes, Known Issues and Bug Fixes
2 parents 1ad1666 + 7656c7a commit bb31a99

File tree

4 files changed

+35
-3
lines changed

4 files changed

+35
-3
lines changed

_attributes/common-attributes.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ endif::[]
207207
:product-rosa: Red{nbsp}Hat OpenShift Service on AWS
208208
:SMProductName: Red{nbsp}Hat OpenShift Service Mesh
209209
:SMProductShortName: Service Mesh
210-
:SMProductVersion: 2.6.10
210+
:SMProductVersion: 2.6.11
211211
:MaistraVersion: 2.6
212212
:KialiProduct: Kiali Operator provided by Red Hat
213213
:SMPlugin: OpenShift Service Mesh Console (OSSMC) plugin

modules/ossm-release-2-6-10.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ This release of {SMProductName} updates the {SMProductName} Operator version to
1010

1111
This release addresses Common Vulnerabilities and Exposures (CVEs) and is supported on {product-title} 4.14 and later.
1212

13-
include::snippets/ossm-current-version-support-snippet.adoc[]
14-
1513
You can use the most current version of the {KialiProduct} with all supported versions of {SMProductName}. The version of {SMProductShortName} automatically ensures a compatible version of Kiali.
1614

1715
[id="ossm-release-2-6-10-components_{context}"]

modules/ossm-release-2-6-11.adoc

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * service_mesh/v2x/servicemesh-release-notes.adoc
4+
5+
:_mod-docs-content-type: REFERENCE
6+
[id="ossm-release-2-6-11_{context}"]
7+
= {SMProductName} version 2.6.11
8+
9+
This release of {SMProductName} updates the {SMProductName} Operator version to 2.6.11, and includes the `ServiceMeshControlPlane` resource version updates for 2.6.11.
10+
11+
This release addresses Common Vulnerabilities and Exposures (CVEs) and is supported on {product-title} 4.14 and later.
12+
13+
include::snippets/ossm-current-version-support-snippet.adoc[]
14+
15+
You can use the most current version of the {KialiProduct} with all supported versions of {SMProductName}. The version of {SMProductShortName} automatically ensures a compatible version of Kiali.
16+
17+
[id="ossm-release-2-6-11-components_{context}"]
18+
== Component updates
19+
20+
|===
21+
|Component |Version
22+
23+
|Istio
24+
|1.20.8
25+
26+
|Envoy Proxy
27+
|1.28.7
28+
29+
|Kiali Server
30+
|1.73
31+
|===

service_mesh/v2x/servicemesh-release-notes.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ toc::[]
88

99
// The following include statements pull in the module files that comprise 2.x release notes.
1010

11+
include::modules/ossm-release-2-6-11.adoc[leveloffset=+1]
12+
1113
include::modules/ossm-release-2-6-10.adoc[leveloffset=+1]
1214

1315
include::modules/ossm-release-2-6-9.adoc[leveloffset=+1]
@@ -57,6 +59,7 @@ include::modules/ossm-release-2-6-1.adoc[leveloffset=+1]
5759
include::modules/ossm-release-2-5-4.adoc[leveloffset=+1]
5860

5961
include::modules/ossm-release-2-4-10.adoc[leveloffset=+1]
62+
6063
include::modules/ossm-release-2-6-0.adoc[leveloffset=+1]
6164

6265
include::modules/ossm-release-2-5-3.adoc[leveloffset=+1]

0 commit comments

Comments
 (0)