From 2e13bdc35ea1ff95ebffcdc67c86523a1f53240d Mon Sep 17 00:00:00 2001
From: bjahagir-OpenShift <bjahagir@redhat.com>
Date: Mon, 31 Aug 2026 18:53:06 +0530
Subject: [PATCH] docs: add 4.20.36 z-stream release notes

- Add RHBA-2026:60446 release notes for OCP 4.20.36
- 1 documented bug fix (OCPBUGS-112087)
- Jira: OSDOCS-21870
- Shipment: https://gitlab.cee.redhat.com/hybrid-platforms/art/ocp-shipment-data/-/merge_requests/771
---
 modules/zstream-4-20-36.adoc              | 41 +++++++++++++++++++++++
 release_notes/ocp-4-20-release-notes.adoc |  3 ++
 2 files changed, 44 insertions(+)
 create mode 100644 modules/zstream-4-20-36.adoc

diff --git a/modules/zstream-4-20-36.adoc b/modules/zstream-4-20-36.adoc
new file mode 100644
index 00000000000..b6251c5a85f
--- /dev/null
+++ b/modules/zstream-4-20-36.adoc
@@ -0,0 +1,41 @@
+// Module included in the following assemblies:
+//
+// * release_notes/ocp-4-20-release-notes.adoc
+
+:_mod-docs-content-type: REFERENCE
+[id="zstream-4-20-36_{context}"]
+= RHBA-2026:60446 - {product-title} {product-version}.36 bug fix and security update
+
+Issued: 01 September 2026
+
+[role="_abstract"]
+{product-title} release {product-version}.36 is now available with updates to packages and images that fix several bugs.
+
+The following advisory contains the container images for this release:
+
+link:https://access.redhat.com/errata/RHBA-2026:60446[RHBA-2026:60446]
+
+The following advisory contains the RPM packages for this release:
+
+link:https://access.redhat.com/errata/RHBA-2026:xxxxx[RHBA-2026:xxxxx]
+
+Space precludes documenting all of the container images for this release. See the following Release Notes documentation for details about these changes:
+
+link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.20/html/release_notes[{product-title} {product-version} Release Notes]
+
+This update includes the following images:
+
+[source,terminal]
+----
+$ oc adm release info 4.20.36 --pullspecs
+----
+
+[id="zstream-4-20-36-fixed-issues_{context}"]
+== Fixed issues
+
+* Previously the Go OpenSSL FIPS provider would potentially overwhelm libcrypto with concurrent requests leading to processes hitting the Go maxThreads limit of 10,000 and crashing. The Go OpenSSL FIPS provider has been updated to limit concurrent requests to libcrypto to 4x the number of CPUs buffering requests as lightweight Goroutines and avoiding the maxThreads limit preventing a crash. (link:https://issues.redhat.com/browse/OCPBUGS-112087[OCPBUGS-112087])
+
+[id="zstream-4-20-36-updating_{context}"]
+== Updating
+
+To update an {product-title} 4.20 cluster to this latest release, see xref:../updating/updating_a_cluster/updating-cluster-cli.adoc#updating-cluster-cli[Updating a cluster using the CLI].
diff --git a/release_notes/ocp-4-20-release-notes.adoc b/release_notes/ocp-4-20-release-notes.adoc
index d935fad7b14..651fa8477bc 100644
--- a/release_notes/ocp-4-20-release-notes.adoc
+++ b/release_notes/ocp-4-20-release-notes.adoc
@@ -32,6 +32,9 @@ include::modules/rn-ocp-release-notes-known-issues.adoc[leveloffset=+1]
 //z-stream release notes
 include::modules/rn-async-errata.adoc[leveloffset=+1]
 
+// 4.20.36 RNs and updating
+include::modules/zstream-4-20-36.adoc[leveloffset=+2]
+
 // 4.20.35 RNs and updating
 include::modules/zstream-4-20-35.adoc[leveloffset=+2]