openshift · jeana-redhat · Sep 3, 2024 · Aug 20, 2024
diff --git a/_attributes/common-attributes.adoc b/_attributes/common-attributes.adoc
@@ -167,7 +167,7 @@ endif::[]
 :product-rosa: Red Hat OpenShift Service on AWS
 :SMProductName: Red Hat OpenShift Service Mesh
 :SMProductShortName: Service Mesh
-:SMProductVersion: 2.6.0
+:SMProductVersion: 2.6.1
 :MaistraVersion: 2.6
 :KialiProduct: Kiali Operator provided by Red Hat
 :SMPlugin: OpenShift Service Mesh Console (OSSMC) plugin

diff --git a/modules/ossm-release-2-4-10.adoc b/modules/ossm-release-2-4-10.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-4-10_{context}"]
+= {SMProductName} version 2.4.10
+
+This release of {SMProductName} addresses Common Vulnerabilities and Exposures (CVEs) and is supported on {product-title} 4.14 and later.
+
+[id=ossm-release-2-4-10-components_{context}]
+== Component updates
+
+|===
+|Component |Version
+
+|Istio
+|1.16.7
+
+|Envoy Proxy
+|1.24.12
+
+|Kiali Server
+|1.65.15
+|===
+
+//add horizontal line rule/line break to help user visually understand that 2.6, 2.5.3, and 2.4.9 are a separate, different release.
+'''
diff --git a/modules/ossm-release-2-5-4.adoc b/modules/ossm-release-2-5-4.adoc
@@ -0,0 +1,26 @@
+////
+Module included in the following assemblies:
+* service_mesh/v2x/servicemesh-release-notes.adoc
+////
+
+:_mod-docs-content-type: REFERENCE
+[id="ossm-release-2-5-4_{context}"]
+= {SMProductName} version 2.5.4
+
+This release of {SMProductName} addresses Common Vulnerabilities and Exposures (CVEs) and is supported on {product-title} 4.14 and later.
+
+[id=ossm-release-2-5-4-components_{context}]
+== Component updates
+
+|===
+|Component |Version
+
+|Istio
+|1.18.5
+
+|Envoy Proxy
+|1.26.8
+
+|Kiali Server
+|1.73.14
+|===
diff --git a/modules/ossm-release-2-6-1.adoc b/modules/ossm-release-2-6-1.adoc
@@ -0,0 +1,37 @@
+////
+Module included in the following assemblies:
+* service_mesh/v2x/servicemesh-release-notes.adoc
+////
+
+:_mod-docs-content-type: REFERENCE
+[id="ossm-release-2-6-1_{context}"]
+= {SMProductName} version 2.6.1
+
+This release of {SMProductName} includes 2.6.1, 2.5.4, and 2.4.10; addresses Common Vulnerabilities and Exposures (CVEs); contains a bug fix; and is supported on {product-title} 4.14 and later.
+
+include::snippets/ossm-current-version-support-snippet.adoc[]
+
+The most current version of the {KialiProduct} can be used 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-1-components_{context}]
+== Component updates
+
+|===
+|Component |Version
+
+|Istio
+|1.20.8
+
+|Envoy Proxy
+|1.28.5
+
+|Kiali Server
+|1.73.14
+|===
+
+[id="ossm-fixed-issues-2-6-1_{context}"]
+== Fixed issues
+
+* https://issues.redhat.com/browse/OSSM-6766[OSSM-6766] Previously, the {SMPlugin} failed if the user wanted to update a namespace (for example, enabling or disabling injection), or create any Istio object (for example, creating traffic policies). Now, the {SMPlugin} does not fail if the user  updates a namespace or creates any Istio object.
+
+// Removed from ossm-rn-known-issues file. ossm-rn-known-issues remains a separate file and is not part of the new OSSM release notes format where fixed issues and known issues are included in the file relating to a specific release.
diff --git a/modules/ossm-rn-known-issues.adoc b/modules/ossm-rn-known-issues.adoc
@@ -201,9 +201,6 @@ New issues for Kiali should be created in the link:https://issues.redhat.com/pro
 
 These are the known issues in Kiali:
 
-* https://issues.redhat.com/browse/OSSM-6766[OSSM-6766] The {SMPlugin} fails if the user wants to update a namespace (for example, enable/disable injection) or create any Istio object (for example, create traffic policies).
-
-Workaround: Use the standalone Kiali application to update a namespace or create any Istio object.
 //Keep KIALI-2206 in RN as this is for information purposes.
 * link:https://issues.jboss.org/browse/KIALI-2206[KIALI-2206] When you are accessing the Kiali console for the first time, and there is no cached browser data for Kiali, the “View in Grafana” link on the Metrics tab of the Kiali Service Details page redirects to the wrong location. The only way you would encounter this issue is if you are accessing Kiali for the first time.
 //Keep KIALI-507 in RN as this is for information purposes.

diff --git a/modules/ossm-rn-new-features.adoc b/modules/ossm-rn-new-features.adoc
@@ -24,7 +24,7 @@ This release adds improvements related to the following components and concepts.
 [id="new-features-ossm-2-6"]
 == New features {SMProductName} version 2.6
 
-This release of {SMProductName} adds new features, addresses Common Vulnerabilities and Exposures (CVEs), and is supported on {product-title} 4.12 and later.
+This release of {SMProductName} adds new features, addresses Common Vulnerabilities and Exposures (CVEs), and is supported on {product-title} 4.14 and later.
 
 This release ends maintenance support for {SMProductName} version 2.3. If you are using {SMProductShortName} version 2.3, you should update to a supported version.
 

diff --git a/service_mesh/v2x/servicemesh-release-notes.adoc b/service_mesh/v2x/servicemesh-release-notes.adoc
@@ -10,6 +10,12 @@ toc::[]
 
 include::modules/making-open-source-more-inclusive.adoc[leveloffset=+1]
 
+include::modules/ossm-release-2-6-1.adoc[leveloffset=+1]
+
+include::modules/ossm-release-2-5-4.adoc[leveloffset=+1]
+
+include::modules/ossm-release-2-4-10.adoc[leveloffset=+1]
+
 include::modules/ossm-rn-new-features.adoc[leveloffset=+1]
 
 // Tech preview not supported in ROSA/OSD