[cherry-pick] fips docs (#5973)

nginxinc · Jul 5, 2024 · da5b256 · da5b256
1 parent 5a26569
commit da5b256
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/docs/content/releases.md b/docs/content/releases.md
@@ -8,7 +8,8 @@ toc: true
 weight: 2100
 ---
 {{< note >}} 
-[Release 3.6.1](#361) does not include FIPS compliant images due to compatibility issues with a dependent library.
+FIPS compliant images are currently impacted by compatibility issues with a dependent library.
+
 We recommend against:
 1. Patching older FIPS images, which could re-introduce the incompatible dependency.
 2. Building new custom FIPS images.
@@ -18,10 +19,6 @@ We recommend against:
 
 04 Jul 2024
 
-{{< note >}}
-This release does not include FIPS compliant images due to compatibility issues with a dependent library.
-{{< /note >}}
-
 ### <i class="fa-solid fa-bug-slash"></i> Fixes
 - [5921](https://github.com/nginxinc/kubernetes-ingress/pull/5921) GRPC healthcheck should not have keepalive time
 - [5889](https://github.com/nginxinc/kubernetes-ingress/pull/5889) Add default telemetry endpoint

diff --git a/docs/content/technical-specifications.md b/docs/content/technical-specifications.md
@@ -80,9 +80,9 @@ NGINX Plus images are available through the F5 Container registry `private-regis
 |<div style="width:200px">Name</div> | <div style="width:100px">Base image</div> | <div style="width:200px">Third-party modules</div> | F5 Container Registry Image | Architectures |
 | ---| ---| --- | --- | --- |
 |Alpine-based image | ``alpine:3.19`` | NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog | `nginx-ic/nginx-plus-ingress:3.6.1-alpine` | arm64<br>amd64 |
-|Alpine-based image with FIPS inside <br><br>_Not currently available for v3.6.1_ | ``alpine:3.19`` | NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog<br><br>FIPS module and OpenSSL configuration | `nginx-ic/nginx-plus-ingress:3.6.0-alpine-fips` | arm64<br>amd64 |
-|Alpine-based image with NGINX App Protect WAF & FIPS inside <br><br>_Not currently available for v3.6.1_ | ``alpine:3.17`` | NGINX App Protect WAF<br><br>NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog<br><br>FIPS module and OpenSSL configuration | `nginx-ic-nap/nginx-plus-ingress:3.6.0-alpine-fips` | amd64 |
-|Alpine-based image with NGINX App Protect WAF v5 & FIPS inside <br><br>_Not currently available for v3.6.1_ | ``alpine:3.17`` | NGINX App Protect WAF v5<br><br>NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog<br><br>FIPS module and OpenSSL configuration | `nginx-ic-nap-v5/nginx-plus-ingress:3.6.0-alpine-fips` | amd64 |
+|Alpine-based image with FIPS inside | ``alpine:3.19`` | NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog<br><br>FIPS module and OpenSSL configuration | `nginx-ic/nginx-plus-ingress:3.6.1-alpine-fips` | arm64<br>amd64 |
+|Alpine-based image with NGINX App Protect WAF & FIPS inside | ``alpine:3.17`` | NGINX App Protect WAF<br><br>NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog<br><br>FIPS module and OpenSSL configuration | `nginx-ic-nap/nginx-plus-ingress:3.6.1-alpine-fips` | amd64 |
+|Alpine-based image with NGINX App Protect WAF v5 & FIPS inside | ``alpine:3.17`` | NGINX App Protect WAF v5<br><br>NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog<br><br>FIPS module and OpenSSL configuration | `nginx-ic-nap-v5/nginx-plus-ingress:3.6.1-alpine-fips` | amd64 |
 |Debian-based image | ``debian:12-slim`` | NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog | `nginx-ic/nginx-plus-ingress:3.6.1` | arm64<br>amd64 |
 |Debian-based image with NGINX App Protect WAF | ``debian:12-slim`` | NGINX App Protect WAF<br><br>NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog | `nginx-ic-nap/nginx-plus-ingress:3.6.1` | amd64 |
 |Debian-based image with NGINX App Protect WAF v5 | ``debian:12-slim`` | NGINX App Protect WAF v5<br><br>NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog | `nginx-ic-nap-v5/nginx-plus-ingress:3.6.1` | amd64 |