diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index b70d9c8466..8ebd2d38f1 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -339,7 +339,7 @@ jobs: - name: Generate WAF v5 tgz from JSON run: | - 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.9.0 -p /data/wafv5.json -o /data/wafv5.tgz + 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.10.0 -p /data/wafv5.json -o /data/wafv5.tgz if: ${{ contains(matrix.images.image, 'nap-v5')}} - name: Run Regression Tests diff --git a/.github/workflows/setup-smoke.yml b/.github/workflows/setup-smoke.yml index 96769962e8..c5b542af15 100644 --- a/.github/workflows/setup-smoke.yml +++ b/.github/workflows/setup-smoke.yml @@ -192,7 +192,7 @@ jobs: - name: Generate WAF v5 tgz from JSON run: | - 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.9.0 -p /data/wafv5.json -o /data/wafv5.tgz + 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.10.0 -p /data/wafv5.json -o /data/wafv5.tgz if: ${{ contains(inputs.image, 'nap-v5')}} - name: Run Smoke Tests diff --git a/charts/nginx-ingress/values.schema.json b/charts/nginx-ingress/values.schema.json index 29888fbe03..bdec7e805b 100644 --- a/charts/nginx-ingress/values.schema.json +++ b/charts/nginx-ingress/values.schema.json @@ -350,10 +350,10 @@ }, "tag": { "type": "string", - "default": "5.9.0", + "default": "5.10.0", "title": "The tag of the App Protect WAF v5 Enforcer image", "examples": [ - "5.9.0" + "5.10.0" ] }, "digest": { @@ -389,7 +389,7 @@ "examples": [ { "repository": "private-registry.nginx.com/nap/waf-enforcer", - "tag": "5.9.0", + "tag": "5.10.0", "pullPolicy": "IfNotPresent" } ] @@ -422,10 +422,10 @@ }, "tag": { "type": "string", - "default": "5.9.0", + "default": "5.10.0", "title": "The tag of the App Protect WAF v5 Config Manager image", "examples": [ - "5.9.0" + "5.10.0" ] }, "digest": { @@ -461,7 +461,7 @@ "examples": [ { "repository": "private-registry.nginx.com/nap/waf-config-mgr", - "tag": "5.9.0", + "tag": "5.10.0", "pullPolicy": "IfNotPresent" } ] @@ -2020,7 +2020,7 @@ "port": 50000, "image": { "repository": "private-registry.nginx.com/nap/waf-enforcer", - "tag": "5.9.0", + "tag": "5.10.0", "pullPolicy": "IfNotPresent" }, "securityContext": {} @@ -2028,7 +2028,7 @@ "configManager": { "image": { "repository": "private-registry.nginx.com/nap/waf-config-mgr", - "tag": "5.9.0", + "tag": "5.10.0", "pullPolicy": "IfNotPresent" }, "securityContext": { @@ -2661,7 +2661,7 @@ "port": 50000, "image": { "repository": "private-registry.nginx.com/nap/waf-enforcer", - "tag": "5.9.0", + "tag": "5.10.0", "pullPolicy": "IfNotPresent" }, "securityContext": {} @@ -2669,7 +2669,7 @@ "configManager": { "image": { "repository": "private-registry.nginx.com/nap/waf-config-mgr", - "tag": "5.9.0", + "tag": "5.10.0", "pullPolicy": "IfNotPresent" }, "securityContext": { diff --git a/charts/nginx-ingress/values.yaml b/charts/nginx-ingress/values.yaml index 9ee9454c5d..3843391e1c 100644 --- a/charts/nginx-ingress/values.yaml +++ b/charts/nginx-ingress/values.yaml @@ -84,7 +84,7 @@ controller: repository: private-registry.nginx.com/nap/waf-enforcer ## The tag of the App Protect WAF v5 Enforcer image. - tag: "5.9.0" + tag: "5.10.0" ## The digest of the App Protect WAF v5 Enforcer image. ## If digest is specified it has precedence over tag and will be used instead # digest: "sha256:CHANGEME" @@ -100,7 +100,7 @@ controller: repository: private-registry.nginx.com/nap/waf-config-mgr ## The tag of the App Protect WAF v5 Configuration Manager image. - tag: "5.9.0" + tag: "5.10.0" ## The digest of the App Protect WAF v5 Configuration Manager image. ## If digest is specified it has precedence over tag and will be used instead # digest: "sha256:CHANGEME" diff --git a/charts/tests/__snapshots__/helmunit_test.snap b/charts/tests/__snapshots__/helmunit_test.snap index 11444705ce..d9cb1b9bd1 100755 --- a/charts/tests/__snapshots__/helmunit_test.snap +++ b/charts/tests/__snapshots__/helmunit_test.snap @@ -1936,7 +1936,7 @@ spec: - -weight-changes-dynamic-reload=false - name: waf-enforcer - image: my.private.reg/nap/waf-enforcer:5.9.0 + image: my.private.reg/nap/waf-enforcer:5.10.0 imagePullPolicy: "IfNotPresent" env: - name: ENFORCER_PORT @@ -1947,7 +1947,7 @@ spec: - name: app-protect-bd-config mountPath: /opt/app_protect/bd_config - name: waf-config-mgr - image: my.private.reg/nap/waf-config-mgr:5.9.0 + image: my.private.reg/nap/waf-config-mgr:5.10.0 imagePullPolicy: "IfNotPresent" securityContext: @@ -2519,7 +2519,7 @@ spec: - -agent-instance-group=app-protect-wafv5-agentv2-nginx-ingress-controller - name: waf-enforcer - image: my.private.reg/nap/waf-enforcer:5.9.0 + image: my.private.reg/nap/waf-enforcer:5.10.0 imagePullPolicy: "IfNotPresent" env: - name: ENFORCER_PORT @@ -2530,7 +2530,7 @@ spec: - name: app-protect-bd-config mountPath: /opt/app_protect/bd_config - name: waf-config-mgr - image: my.private.reg/nap/waf-config-mgr:5.9.0 + image: my.private.reg/nap/waf-config-mgr:5.10.0 imagePullPolicy: "IfNotPresent" securityContext: diff --git a/tests/settings.py b/tests/settings.py index 335cbb80fa..9177e8c433 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -33,4 +33,4 @@ # Nginx registry address to pull waf components from NGX_REG = "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr" # WAF component version to pull from above registry -WAF_V5_VERSION = "5.9.0" +WAF_V5_VERSION = "5.10.0"