Conflict resolutions (squash)

openshift · Apr 1, 2024 · 6e6dede · 6e6dede
1 parent 4723ee3
commit 6e6dede
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 7 deletions.
diff --git a/modules/ossm-rn-fixed-issues.adoc b/modules/ossm-rn-fixed-issues.adoc
@@ -14,20 +14,26 @@ Provide the following info for each issue if possible:
 *Result* - How has the behavior changed as a result? Try to avoid “It is fixed” or “The issue is resolved” or “The error no longer presents”.
 ////
 
-The following issue has been resolved in the current release:
+The following issues have been resolved in the current release:
 
-* https://issues.redhat.com/browse/OSSM-1397[OSSM-1397] Previously, if you removed the `maistra.io/member-of` label from a namespace, the {SMProductShortName} Operator did not automatically reapply the label to the namespace. As a result, sidecar injection did not work in the namespace.
-+
-The Operator would reapply the label to the namespace when you made changes to the `ServiceMeshMember` object, which triggered the reconciliation of this member object.
-+
-Now, any change to the namespace also triggers the member object reconciliation.
+* https://issues.redhat.com/browse/OSSM-6099[OSSM-6099] Previously, the OpenShift Service Mesh Console (OSSMC) plugin failed to load correctly in an IPv6 cluster. Now, the OSSMC plugin configuration has been modified to ensure proper loading in an IPv6 cluster.
+
+* https://issues.redhat.com/browse/OSSM-5960[OSSM-5960] Previously, the OpenShift Service Mesh Console (OSSM) plugin did not display notification messages such as backend errors or istio validations . Now, these notifications are displayed correctly at the top of the plugin page.
+
+* https://issues.redhat.com/browse/OSSM-5959[OSSM-5959] Previously, the OpenShift Service Mesh Console (OSSM) plugin did not display TLS and Istio certification information in the **Overview** page. Now, this information is displayed correctly.
 
 The following issues have been resolved in previous releases:
 
 [id="ossm-rn-fixed-issues-ossm_{context}"]
 == {SMProductShortName} fixed issues
 
-* https://issues.redhat.com/browse/OSSM-3647[OSSM-3647] Previously, in the {SMProductShortName} control plane (SMCP) v2.2 (Istio 1.12), WasmPlugins were applied only to inbound listeners. Since SMCP v2.3 (Istio 1.14), WasmPlugins have been applied to inbound and outbound listeners by default, which introduced regression for users of the 3scale WasmPlugin. Now, the environment variable `APPLY_WASM_PLUGINS_TO_INBOUND_ONLY` is added, which allows safe migration from SMCP v2.2 to v2.3 and v2.4. 
+* https://issues.redhat.com/browse/OSSM-1397[OSSM-1397] Previously, if you removed the `maistra.io/member-of` label from a namespace, the {SMProductShortName} Operator did not automatically reapply the label to the namespace. As a result, sidecar injection did not work in the namespace.
++
+The Operator would reapply the label to the namespace when you made changes to the `ServiceMeshMember` object, which triggered the reconciliation of this member object.
++
+Now, any change to the namespace also triggers the member object reconciliation.
+
+* https://issues.redhat.com/browse/OSSM-3647[OSSM-3647] Previously, in the {SMProductShortName} control plane (SMCP) v2.2 (Istio 1.12), WasmPlugins were applied only to inbound listeners. Since SMCP v2.3 (Istio 1.14), WasmPlugins have been applied to inbound and outbound listeners by default, which introduced regression for users of the 3scale WasmPlugin. Now, the environment variable `APPLY_WASM_PLUGINS_TO_INBOUND_ONLY` is added, which allows safe migration from SMCP v2.2 to v2.3 and v2.4.
 +
 The following setting should be added to the SMCP config:
 +

diff --git a/modules/ossm-rn-new-features.adoc b/modules/ossm-rn-new-features.adoc
@@ -15,6 +15,30 @@ Module included in the following assemblies:
 
 This release adds improvements related to the following components and concepts.
 
+[id="new-features-ossm-2-5-1"]
+== New features {SMProductName} version 2.5.1
+
+//As of March 28, 2024, there are no new features so the phrase "new features" has been removed. This release is to address container grades, and at least 1 Kiali bug fix.
+
+This release of {SMProductName} adds addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.12 and later.
+
+=== Component versions for {SMProductName} version 2.5.1
+
+//Release is scheduled for April 18, 2024. Code Freeze is scheduled for April 4, 2024. Component versions should be available after April 4.
+
+|===
+|Component |Version
+
+|Istio
+|
+
+|Envoy Proxy
+|
+
+|Kiali
+|1.73.4
+|===
+
 [id="new-features-ossm-2-5"]
 == New features {SMProductName} version 2.5
 
@@ -121,6 +145,30 @@ A new version of the Gateway API custom resource definition (CRD) is now availab
 |For multitenant mesh deployment, all Gateway API CRDs must be present. Use the experimental branch.
 |===
 
+[id="new-features-ossm-2-4-7"]
+== New features {SMProductName} version 2.4.7
+
+//As of March 28, 2024, there are no new features so the phrase "new features" has been removed. This release is to address container grades, and at least 1 Kiali bug fix.
+
+This release of {SMProductName} adds addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.12 and later.
+
+=== Component versions for {SMProductName} version 2.4.7
+
+//Release is scheduled for April 18, 2024. Code Freeze is scheduled for April 4, 2024. Component versions should be available after April 4.
+
+|===
+|Component |Version
+
+|Istio
+|
+
+|Envoy Proxy
+|
+
+|Kiali
+|1.73.4
+|===
+
 [id="new-features-ossm-2-4-6"]
 == New features {SMProductName} version 2.4.6
 
@@ -417,6 +465,31 @@ ifndef::openshift-rosa,openshift-dedicated[]
 * OpenTelemetry API remains a Technology Preview feature.
 endif::openshift-rosa,openshift-dedicated[]
 
+[id="new-features-ossm-2-3-11"]
+== New features {SMProductName} version 2.3.11
+
+//With 2.5.1
+//As of March 28, 2024, there are no new features so the phrase "new features" has been removed.
+
+This release of {SMProductName} adds addresses Common Vulnerabilities and Exposures (CVEs), contains bug fixes, and is supported on {product-title} 4.12 and later.
+
+=== Component versions for {SMProductName} version 2.3.11
+
+//Release is scheduled for April 18, 2024. Code Freeze is scheduled for April 4, 2024. Component versions should be available after April 4.
+
+|===
+|Component |Version
+
+|Istio
+|
+
+|Envoy Proxy
+|
+
+|Kiali
+|1.73.4
+|===
+
 [id="new-features-ossm-2-3-10"]
 == New features {SMProductName} version 2.3.10
 //Update with 2.5