Merge pull request #97304 from openshift-cherrypick-robot/cherry-pick-97282-to-enterprise-4.16

[enterprise-4.16] OSSM-10063  2.6.9 (At Stage): [DOC] Release Notes, Known Issues and Bug Fixes

Author: briandooley

_attributes/common-attributes.adoc

@@ -174,7 +174,7 @@ endif::[]
 :product-rosa: Red Hat OpenShift Service on AWS
 :SMProductName: Red Hat OpenShift Service Mesh
 :SMProductShortName: Service Mesh
-:SMProductVersion: 2.6.8
+:SMProductVersion: 2.6.9
 :MaistraVersion: 2.6
 :KialiProduct: Kiali Operator provided by Red Hat
 :SMPlugin: OpenShift Service Mesh Console (OSSMC) plugin

modules/ossm-release-2-5-12.adoc

@@ -0,0 +1,25 @@
+// Module included in the following assemblies:
+//
+// * service_mesh/v2x/servicemesh-release-notes.adoc
+
+:_mod-docs-content-type: REFERENCE
+[id="ossm-release-2-5-12_{context}"]
+= {SMProductName} version 2.5.12
+
+This release of {SMProductName} is included with the {SMProductName} Operator 2.6.9 and is supported on {product-title} 4.14 and later. This release addresses Common Vulnerabilities and Exposures (CVEs).
+
+[id="ossm-release-2-5-12-components_{context}"]
+== Component updates
+
+|===
+|Component |Version
+
+|Istio
+|1.18.7
+
+|Envoy Proxy
+|1.26.8
+
+|Kiali Server
+|1.73.21
+|===

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

@@ -10,8 +10,6 @@ This release of {SMProductName} updates the {SMProductName} Operator version to
 
 This release addresses Common Vulnerabilities and Exposures (CVEs) and is supported on {product-title} 4.14 and later.
 
-include::snippets/ossm-current-version-support-snippet.adoc[]
-
 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.
 
 [id="ossm-release-2-6-8-components_{context}"]

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

@@ -0,0 +1,29 @@
+// Module included in the following assemblies:
+//
+// * service_mesh/v2x/servicemesh-release-notes.adoc
+
+:_mod-docs-content-type: REFERENCE
+[id="ossm-release-2-6-9_{context}"]
+= {SMProductName} version 2.6.9
+
+This release of {SMProductName} updates the {SMProductName} Operator version to 2.6.9, and includes the following `ServiceMeshControlPlane` resource version updates: 2.6.9 and 2.5.12.
+
+This release addresses Common Vulnerabilities and Exposures (CVEs) and is supported on {product-title} 4.14 and later.
+
+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.
+
+[id="ossm-release-2-6-9-components_{context}"]
+== Component updates
+
+|===
+|Component |Version
+
+|Istio
+|1.20.8
+
+|Envoy Proxy
+|1.28.7
+
+|Kiali Server
+|1.73.21
+|===

service_mesh/v2x/servicemesh-release-notes.adoc

@@ -8,6 +8,10 @@ toc::[]
 
 // The following include statements pull in the module files that comprise 2.x release notes.
 
+include::modules/ossm-release-2-6-9.adoc[leveloffset=+1]
+
+include::modules/ossm-release-2-5-12.adoc[leveloffset=+1]
+
 include::modules/ossm-release-2-6-8.adoc[leveloffset=+1]
 
 include::modules/ossm-release-2-5-11.adoc[leveloffset=+1]