Skip to content

Commit 30f57b7

Browse files
AlexFenlonAlexFenlon
committed
Update PLUS to R35, OSS to 1.29.1, Update NAP WAF 5.8
1 parent 8bcf672 commit 30f57b7

File tree

9 files changed

+143
-143
lines changed

9 files changed

+143
-143
lines changed

‎.github/workflows/regression.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ jobs:
265265
266266
- name: Generate WAF v5 tgz from JSON
267267
run: |
268-
docker run --rm --user root -v /var/run/docker.sock:/var/run/docker.sock -v ${{ github.workspace }}/tests/data/ap-waf-v5:/data gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/nap/waf-compiler:5.6.0 -p /data/wafv5.json -o /data/wafv5.tgz
268+
docker run --rm --user root -v /var/run/docker.sock:/var/run/docker.sock -v ${{ github.workspace }}/tests/data/ap-waf-v5:/data gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/nap/waf-compiler:5.8.0 -p /data/wafv5.json -o /data/wafv5.tgz
269269
if: ${{ contains(matrix.images.image, 'nap-v5')}}
270270

271271
- name: Run Regression Tests

‎.github/workflows/setup-smoke.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146

147147
- name: Generate WAF v5 tgz from JSON
148148
run: |
149-
docker run --rm --user root -v /var/run/docker.sock:/var/run/docker.sock -v ${{ github.workspace }}/tests/data/ap-waf-v5:/data gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/nap/waf-compiler:5.6.0 -p /data/wafv5.json -o /data/wafv5.tgz
149+
docker run --rm --user root -v /var/run/docker.sock:/var/run/docker.sock -v ${{ github.workspace }}/tests/data/ap-waf-v5:/data gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/nap/waf-compiler:5.8.0 -p /data/wafv5.json -o /data/wafv5.tgz
150150
if: ${{ contains(inputs.image, 'nap-v5')}}
151151

152152
- name: Run Smoke Tests

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
VER = $(shell grep IC_VERSION .github/data/version.txt | cut -d '=' -f 2)
33
GIT_TAG = $(shell git describe --exact-match --tags || echo untagged)
44
VERSION = $(VER)-SNAPSHOT
5-
NGINX_OSS_VERSION ?= 1.29
6-
NGINX_PLUS_VERSION ?= R34
5+
NGINX_OSS_VERSION ?= 1.29.1
6+
NGINX_PLUS_VERSION ?= R35
77
PLUS_ARGS = --build-arg NGINX_PLUS_VERSION=$(NGINX_PLUS_VERSION) --secret id=nginx-repo.crt,src=nginx-repo.crt --secret id=nginx-repo.key,src=nginx-repo.key
88

99
# Variables that can be overridden

‎build/Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1.16
22
ARG BUILD_OS=debian
3-
ARG NGINX_OSS_VERSION=1.29
4-
ARG NGINX_PLUS_VERSION=R34
3+
ARG NGINX_OSS_VERSION=1.29.1
4+
ARG NGINX_PLUS_VERSION=R35
55
ARG DOWNLOAD_TAG=edge
66
ARG DEBIAN_FRONTEND=noninteractive
77
ARG PREBUILT_BASE_IMG=nginx/nginx-ingress:${DOWNLOAD_TAG}
@@ -82,7 +82,7 @@ USER 101
8282

8383

8484
############################################# Base image for Alpine #############################################
85-
FROM nginx:1.29.0-alpine@sha256:b2e814d28359e77bd0aa5fed1939620075e4ffa0eb20423cc557b375bd5c14ad AS alpine
85+
FROM nginx:1.29.1-alpine3.22@sha256:599f75c32c9bfe5859e022f75d26e4d939f5b1097c7abc1add287d48ec100f1e AS alpine
8686
ARG PACKAGE_REPO
8787
ARG NGINX_OSS_VERSION
8888

@@ -100,7 +100,7 @@ RUN --mount=type=bind,from=nginx-files,src=nginx_signing.rsa.pub,target=/etc/apk
100100

101101

102102
############################################# Base image for Debian #############################################
103-
FROM nginx:1.29.0@sha256:dc53c8f25a10f9109190ed5b59bda2d707a3bde0e45857ce9e1efaa32ff9cbc1 AS debian
103+
FROM nginx:1.29.1@sha256:33e0bbc7ca9ecf108140af6288c7c9d1ecc77548cbfd3952fd8466a75edefe57 AS debian
104104

105105
RUN --mount=type=bind,from=nginx-files,src=nginx_signing.key,target=/tmp/nginx_signing.key \
106106
--mount=type=bind,from=nginx-files,src=90pkgs-nginx,target=/etc/apt/apt.conf.d/90pkgs-nginx \
@@ -219,7 +219,7 @@ RUN --mount=type=bind,from=alpine-fips-3.19,target=/tmp/fips/ \
219219
&& printf "%s\n" "https://pkgs.nginx.com/app-protect-security-updates/alpine/v$(grep -E -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
220220
&& printf "%s\n" "https://${PACKAGE_REPO}/nginx-agent/alpine/v$(grep -E -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
221221
&& apk add --no-cache libcap-utils libcurl nginx-plus nginx-plus-module-njs nginx-plus-module-otel nginx-plus-module-fips-check \
222-
&& apk add --no-cache nginx-agent~3.2 \
222+
&& apk add --no-cache nginx-agent~2 \
223223
&& mkdir -p /usr/ssl \
224224
&& cp -av /tmp/fips/usr/lib/ossl-modules/fips.so /usr/lib/ossl-modules/fips.so \
225225
&& cp -av /tmp/fips/usr/ssl/fipsmodule.cnf /usr/ssl/fipsmodule.cnf \
@@ -250,14 +250,14 @@ RUN --mount=type=bind,from=alpine-fips-3.19,target=/tmp/fips/ \
250250
&& printf "%s\n" "https://${PACKAGE_REPO}/app-protect-x-plus/alpine/v$(grep -E -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
251251
&& printf "%s\n" "https://${PACKAGE_REPO}/nginx-agent/alpine/v$(grep -E -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
252252
&& apk add --no-cache libcap-utils libcurl nginx-plus nginx-plus-module-njs nginx-plus-module-otel nginx-plus-module-fips-check \
253-
&& apk add --no-cache nginx-agent~3.2 \
253+
&& apk add --no-cache nginx-agent~2 \
254254
&& mkdir -p /usr/ssl \
255255
&& cp -av /tmp/fips/usr/lib/ossl-modules/fips.so /usr/lib/ossl-modules/fips.so \
256256
&& cp -av /tmp/fips/usr/ssl/fipsmodule.cnf /usr/ssl/fipsmodule.cnf \
257257
&& cp -av /tmp/fips/etc/ssl/openssl.cnf /etc/ssl/openssl.cnf \
258258
&& mkdir -p /etc/nginx/reporting/ \
259259
&& cp -av /tmp/nginx/reporting/tracking.info /etc/nginx/reporting/tracking.info \
260-
&& apk add --no-cache app-protect-module-plus~=34.5.442 \
260+
&& apk add --no-cache app-protect-module-plus~=35.5.498 \
261261
&& sed -i -e '/nginx.com/d' /etc/apk/repositories \
262262
&& nap-waf.sh \
263263
agent.sh
@@ -359,7 +359,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
359359
--mount=type=bind,from=nginx-files,src=nap-waf.sh,target=/usr/local/bin/nap-waf.sh \
360360
--mount=type=bind,from=nginx-files,src=debian-agent-12.sources,target=/etc/apt/sources.list.d/nginx-agent.sources \
361361
apt-get update \
362-
&& apt-get install --no-install-recommends --no-install-suggests -y nginx-agent=2.* app-protect-module-plus=34+5.442* nginx-plus-module-appprotect=34+5.442* app-protect-plugin=6.16.0* \
362+
&& apt-get install --no-install-recommends --no-install-suggests -y nginx-agent=2.* app-protect-module-plus=35+5.498* nginx-plus-module-appprotect=34+5.442* app-protect-plugin=6.20.0* \
363363
&& nap-waf.sh \
364364
&& agent.sh
365365

@@ -461,7 +461,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
461461
&& rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm \
462462
&& rpm -Uvh /ubi-bin/c-ares-*.rpm \
463463
&& microdnf --nodocs install -y ca-certificates shadow-utils subscription-manager \
464-
&& microdnf --nodocs install -y nginx-plus-module-otel nginx-agent-2.* app-protect-module-plus-34+5.442* \
464+
&& microdnf --nodocs install -y nginx-plus-module-otel nginx-agent-2.* app-protect-module-plus-35+5.498* \
465465
&& nap-waf.sh \
466466
&& ubi-clean.sh \
467467
&& agent.sh
@@ -531,7 +531,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
531531
&& rpm --import /tmp/nginx_signing.key \
532532
&& rpm -Uvh /ubi-bin/c-ares-*.rpm \
533533
&& dnf --nodocs install -y nginx-plus nginx-plus-module-njs nginx-plus-module-otel nginx-plus-module-fips-check nginx-agent-2.* \
534-
&& dnf --nodocs install -y app-protect-module-plus-34+5.442* \
534+
&& dnf --nodocs install -y app-protect-module-plus-35+5.498* \
535535
&& nap-waf.sh \
536536
&& agent.sh \
537537
&& dnf clean all

‎charts/nginx-ingress/values.schema.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -351,10 +351,10 @@
351351
},
352352
"tag": {
353353
"type": "string",
354-
"default": "5.6.0",
354+
"default": "5.8.0",
355355
"title": "The tag of the App Protect WAF v5 Enforcer image",
356356
"examples": [
357-
"5.6.0"
357+
"5.8.0"
358358
]
359359
},
360360
"digest": {
@@ -391,7 +391,7 @@
391391
"examples": [
392392
{
393393
"repository": "private-registry.nginx.com/nap/waf-enforcer",
394-
"tag": "5.6.0",
394+
"tag": "5.8.0",
395395
"pullPolicy": "IfNotPresent"
396396
}
397397
]
@@ -425,10 +425,10 @@
425425
},
426426
"tag": {
427427
"type": "string",
428-
"default": "5.6.0",
428+
"default": "5.8.0",
429429
"title": "The tag of the App Protect WAF v5 Config Manager image",
430430
"examples": [
431-
"5.6.0"
431+
"5.8.0"
432432
]
433433
},
434434
"digest": {
@@ -465,7 +465,7 @@
465465
"examples": [
466466
{
467467
"repository": "private-registry.nginx.com/nap/waf-config-mgr",
468-
"tag": "5.6.0",
468+
"tag": "5.8.0",
469469
"pullPolicy": "IfNotPresent"
470470
}
471471
]
@@ -1953,15 +1953,15 @@
19531953
"port": 50000,
19541954
"image": {
19551955
"repository": "private-registry.nginx.com/nap/waf-enforcer",
1956-
"tag": "5.6.0",
1956+
"tag": "5.8.0",
19571957
"pullPolicy": "IfNotPresent"
19581958
},
19591959
"securityContext": {}
19601960
},
19611961
"configManager": {
19621962
"image": {
19631963
"repository": "private-registry.nginx.com/nap/waf-config-mgr",
1964-
"tag": "5.6.0",
1964+
"tag": "5.8.0",
19651965
"pullPolicy": "IfNotPresent"
19661966
},
19671967
"securityContext": {
@@ -2596,15 +2596,15 @@
25962596
"port": 50000,
25972597
"image": {
25982598
"repository": "private-registry.nginx.com/nap/waf-enforcer",
2599-
"tag": "5.6.0",
2599+
"tag": "5.8.0",
26002600
"pullPolicy": "IfNotPresent"
26012601
},
26022602
"securityContext": {}
26032603
},
26042604
"configManager": {
26052605
"image": {
26062606
"repository": "private-registry.nginx.com/nap/waf-config-mgr",
2607-
"tag": "5.6.0",
2607+
"tag": "5.8.0",
26082608
"pullPolicy": "IfNotPresent"
26092609
},
26102610
"securityContext": {

‎charts/nginx-ingress/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ controller:
8484
repository: private-registry.nginx.com/nap/waf-enforcer
8585

8686
## The tag of the App Protect WAF v5 Enforcer image.
87-
tag: "5.6.0"
87+
tag: "5.8.0"
8888
## The digest of the App Protect WAF v5 Enforcer image.
8989
## If digest is specified it has precedence over tag and will be used instead
9090
# digest: "sha256:CHANGEME"
@@ -100,7 +100,7 @@ controller:
100100
repository: private-registry.nginx.com/nap/waf-config-mgr
101101

102102
## The tag of the App Protect WAF v5 Configuration Manager image.
103-
tag: "5.6.0"
103+
tag: "5.8.0"
104104
## The digest of the App Protect WAF v5 Configuration Manager image.
105105
## If digest is specified it has precedence over tag and will be used instead
106106
# digest: "sha256:CHANGEME"

‎charts/tests/__snapshots__/helmunit_test.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1932,7 +1932,7 @@ spec:
19321932
- -weight-changes-dynamic-reload=false
19331933

19341934
- name: waf-enforcer
1935-
image: my.private.reg/nap/waf-enforcer:5.6.0
1935+
image: my.private.reg/nap/waf-enforcer:5.8.0
19361936
imagePullPolicy: "IfNotPresent"
19371937
env:
19381938
- name: ENFORCER_PORT
@@ -1943,7 +1943,7 @@ spec:
19431943
- name: app-protect-bd-config
19441944
mountPath: /opt/app_protect/bd_config
19451945
- name: waf-config-mgr
1946-
image: my.private.reg/nap/waf-config-mgr:5.6.0
1946+
image: my.private.reg/nap/waf-config-mgr:5.8.0
19471947
imagePullPolicy: "IfNotPresent"
19481948
securityContext:
19491949

@@ -2514,7 +2514,7 @@ spec:
25142514
- -agent-instance-group=app-protect-wafv5-agentv2-nginx-ingress-controller
25152515

25162516
- name: waf-enforcer
2517-
image: my.private.reg/nap/waf-enforcer:5.6.0
2517+
image: my.private.reg/nap/waf-enforcer:5.8.0
25182518
imagePullPolicy: "IfNotPresent"
25192519
env:
25202520
- name: ENFORCER_PORT
@@ -2525,7 +2525,7 @@ spec:
25252525
- name: app-protect-bd-config
25262526
mountPath: /opt/app_protect/bd_config
25272527
- name: waf-config-mgr
2528-
image: my.private.reg/nap/waf-config-mgr:5.6.0
2528+
image: my.private.reg/nap/waf-config-mgr:5.8.0
25292529
imagePullPolicy: "IfNotPresent"
25302530
securityContext:
25312531

0 commit comments

Comments
 (0)