Skip to content

Commit 606b33b

Browse files
haywoodshpdabelf5vepatel
authored
Re-add FIPs images to tests, image patching & release (#6948)
* add fips image to pipeline Signed-off-by: Haywood Shannon <[email protected]> Signed-off-by: Haywood Shannon <[email protected]> * re-add fips images to patching and release * add fips images to tech specs * remove FIPS note from release notes * switch tests for fips --------- Signed-off-by: Haywood Shannon <[email protected]> Co-authored-by: Paul Abel <[email protected]> Co-authored-by: Paul Abel <[email protected]> Co-authored-by: Venktesh Shivam Patel <[email protected]>
1 parent 4b0636b commit 606b33b

File tree

7 files changed

+30
-17
lines changed

7 files changed

+30
-17
lines changed

‎.github/config/config-plus-gcr-release

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export TARGET_REGISTRY=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release
2-
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-mktpl")
3-
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-mktpl")
4-
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8")
2+
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips" "-mktpl")
3+
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips" "-mktpl")
4+
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-alpine-fips" "-ubi8")
55
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
66
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
77
declare -a ADDITIONAL_TAGS=("latest" "${ADDITIONAL_TAG}")

‎.github/config/config-plus-nginx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
export TARGET_REGISTRY=docker-mgmt.nginx.com
22
export TARGET_NAP_WAF_DOS_IMAGE_PREFIX="nginx-ic-nap-dos/nginx-plus-ingress"
3-
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine")
4-
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8")
5-
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8")
3+
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips")
4+
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips")
5+
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips")
66
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi")
77
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi")
88
export PUBLISH_OSS=false

‎.github/data/matrix-smoke-nap.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
{
2020
"label": "AP_WAF 3/4",
21-
"image": "debian-plus-nap",
21+
"image": "alpine-plus-nap-fips",
2222
"type": "plus",
2323
"nap_modules": "waf",
2424
"marker": "appprotect_waf_policies_grpc",

‎.github/data/matrix-smoke-plus.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
},
3838
{
3939
"label": "ingresses 2/2",
40-
"image": "alpine-plus",
40+
"image": "alpine-plus-fips",
4141
"type": "plus",
4242
"marker": "'annotations or basic_auth or hsts or watch_namespace or wildcard_tls'",
4343
"platforms": "linux/arm64, linux/amd64"
@@ -51,7 +51,7 @@
5151
},
5252
{
5353
"label": "VSR 2/3",
54-
"image": "alpine-plus",
54+
"image": "alpine-plus-fips",
5555
"type": "plus",
5656
"marker": "'vsr_basic or vsr_canned or vsr_rewrite or vsr_redirects or vsr_upstream'",
5757
"platforms": "linux/arm64, linux/amd64"

‎.github/data/patch-images.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@
3535
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress",
3636
"platforms": "linux/arm64, linux/amd64"
3737
},
38+
{
39+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress",
40+
"source_os": "alpine-fips",
41+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress",
42+
"platforms": "linux/arm64, linux/amd64"
43+
},
3844
{
3945
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress",
4046
"source_os": "ubi",
@@ -65,6 +71,12 @@
6571
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress",
6672
"platforms": "linux/amd64"
6773
},
74+
{
75+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress",
76+
"source_os": "alpine-fips",
77+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress",
78+
"platforms": "linux/amd64"
79+
},
6880
{
6981
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap-v5/nginx-plus-ingress",
7082
"source_os": "debian",
@@ -83,6 +95,12 @@
8395
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap-v5/nginx-plus-ingress",
8496
"platforms": "linux/amd64"
8597
},
98+
{
99+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap-v5/nginx-plus-ingress",
100+
"source_os": "alpine-fips",
101+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap-v5/nginx-plus-ingress",
102+
"platforms": "linux/amd64"
103+
},
86104
{
87105
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos/nginx-plus-ingress",
88106
"source_os": "debian",

‎site/content/releases.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@ toc: true
88
weight: 2100
99

1010
---
11-
{{< note >}}
12-
FIPS compliant images are currently impacted by compatibility issues with a dependent library.
13-
14-
We recommend against:
15-
1. Patching older FIPS images, which could re-introduce the incompatible dependency.
16-
2. Building new custom FIPS images.
17-
{{< /note >}}
18-
1911
{{< note >}}
2012
In our next major release, `v4.0.0`, the default log library for NGINX Ingress Controller will be changed from `golang/glog` to `log/slog`.
2113
This will mean that logs generated by NGINX Ingress Controller will be in a structured format with the option to choose a `string` or `json` output.

‎site/content/technical-specifications.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ NGINX Plus images are available through the F5 Container registry `private-regis
7474
|<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 |
7575
| ---| ---| --- | --- | --- |
7676
|Alpine-based image | ``alpine:3.20`` | NGINX Plus JavaScript and OpenTracing modules<br><br>OpenTracing tracers for Jaeger<br><br>Zipkin and Datadog | `nginx-ic/nginx-plus-ingress:{{< nic-version >}}-alpine` | arm64<br>amd64 |
77+
|Alpine-based image with FIPS inside | ``alpine:3.20`` | 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:{{< nic-version >}}-alpine-fips` | arm64<br>amd64 |
78+
|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:{{< nic-version >}}-alpine-fips` | arm64<br>amd64 |
79+
|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:{{< nic-version >}}-alpine-fips` | arm64<br>amd64 |
7780
|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:{{< nic-version >}}` | arm64<br>amd64 |
7881
|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:{{< nic-version >}}` | amd64 |
7982
|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:{{< nic-version >}}` | amd64 |

0 commit comments

Comments
 (0)