From ec3c1868ce238d37f3dadbb534fdedd8bf674141 Mon Sep 17 00:00:00 2001
From: shreyasiddhartha <ssiddhar@redhat.com>
Date: Tue, 8 Apr 2025 18:21:00 +0530
Subject: [PATCH] OSSM-9119

---
 _attributes/common-attributes.adoc            |  2 +-
 modules/ossm-release-2-5-10.adoc              | 25 +++++++++++++++
 modules/ossm-release-2-6-6.adoc               |  2 --
 modules/ossm-release-2-6-7.adoc               | 31 +++++++++++++++++++
 .../v2x/servicemesh-release-notes.adoc        |  4 +++
 5 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 modules/ossm-release-2-5-10.adoc
 create mode 100644 modules/ossm-release-2-6-7.adoc

diff --git a/_attributes/common-attributes.adoc b/_attributes/common-attributes.adoc
index 6886da6fdb..8aa39a7f64 100644
--- a/_attributes/common-attributes.adoc
+++ b/_attributes/common-attributes.adoc
@@ -187,7 +187,7 @@ endif::[]
 :product-rosa: Red Hat OpenShift Service on AWS
 :SMProductName: Red Hat OpenShift Service Mesh
 :SMProductShortName: Service Mesh
-:SMProductVersion: 2.6.6
+:SMProductVersion: 2.6.7
 :MaistraVersion: 2.6
 :KialiProduct: Kiali Operator provided by Red Hat
 :SMPlugin: OpenShift Service Mesh Console (OSSMC) plugin
diff --git a/modules/ossm-release-2-5-10.adoc b/modules/ossm-release-2-5-10.adoc
new file mode 100644
index 0000000000..868a5fb516
--- /dev/null
+++ b/modules/ossm-release-2-5-10.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-10_{context}"]
+= {SMProductName} version 2.5.10
+
+This release of {SMProductName} is included with the {SMProductName} Operator 2.6.7 and is supported on {product-title} 4.14 and later. This release addresses Common Vulnerabilities and Exposures (CVEs).
+
+[id="ossm-release-2-5-10-components_{context}"]
+== Component updates
+
+|===
+|Component |Version
+
+|Istio
+|1.18.7
+
+|Envoy Proxy
+|1.26.8
+
+|Kiali Server
+|1.73.20
+|===
\ No newline at end of file
diff --git a/modules/ossm-release-2-6-6.adoc b/modules/ossm-release-2-6-6.adoc
index 24fc1af0b8..3b0ab5e407 100644
--- a/modules/ossm-release-2-6-6.adoc
+++ b/modules/ossm-release-2-6-6.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} is specified by using the `ServiceMeshControlPlane` resource. The version of {SMProductShortName} automatically ensures a compatible version of Kiali.
 
 [id="ossm-release-2-6-6-components_{context}"]
diff --git a/modules/ossm-release-2-6-7.adoc b/modules/ossm-release-2-6-7.adoc
new file mode 100644
index 0000000000..0c5fae4ca9
--- /dev/null
+++ b/modules/ossm-release-2-6-7.adoc
@@ -0,0 +1,31 @@
+// Module included in the following assemblies:
+//
+// * service_mesh/v2x/servicemesh-release-notes.adoc
+
+:_mod-docs-content-type: REFERENCE
+[id="ossm-release-2-6-7_{context}"]
+= {SMProductName} version 2.6.7
+
+This release of {SMProductName} updates the {SMProductName} Operator version to 2.6.7, and includes the following `ServiceMeshControlPlane` resource version updates: 2.6.7 and 2.5.10.
+
+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} is specified by using the `ServiceMeshControlPlane` resource. The version of {SMProductShortName} automatically ensures a compatible version of Kiali.
+
+[id="ossm-release-2-6-7-components_{context}"]
+== Component updates
+
+|===
+|Component |Version
+
+|Istio
+|1.20.8
+
+|Envoy Proxy
+|1.28.7
+
+|Kiali Server
+|1.73.20
+|===
diff --git a/service_mesh/v2x/servicemesh-release-notes.adoc b/service_mesh/v2x/servicemesh-release-notes.adoc
index abdd904bc5..0fb11c73c5 100644
--- a/service_mesh/v2x/servicemesh-release-notes.adoc
+++ b/service_mesh/v2x/servicemesh-release-notes.adoc
@@ -10,6 +10,10 @@ toc::[]
 
 include::modules/making-open-source-more-inclusive.adoc[leveloffset=+1]
 
+include::modules/ossm-release-2-6-7.adoc[leveloffset=+1]
+
+include::modules/ossm-release-2-5-10.adoc[leveloffset=+1]
+
 include::modules/ossm-release-2-6-6.adoc[leveloffset=+1]
 
 include::modules/ossm-release-2-5-9.adoc[leveloffset=+1]