Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/setup-smoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions charts/nginx-ingress/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -389,7 +389,7 @@
"examples": [
{
"repository": "private-registry.nginx.com/nap/waf-enforcer",
"tag": "5.9.0",
"tag": "5.10.0",
"pullPolicy": "IfNotPresent"
}
]
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -461,7 +461,7 @@
"examples": [
{
"repository": "private-registry.nginx.com/nap/waf-config-mgr",
"tag": "5.9.0",
"tag": "5.10.0",
"pullPolicy": "IfNotPresent"
}
]
Expand Down Expand Up @@ -2020,15 +2020,15 @@
"port": 50000,
"image": {
"repository": "private-registry.nginx.com/nap/waf-enforcer",
"tag": "5.9.0",
"tag": "5.10.0",
"pullPolicy": "IfNotPresent"
},
"securityContext": {}
},
"configManager": {
"image": {
"repository": "private-registry.nginx.com/nap/waf-config-mgr",
"tag": "5.9.0",
"tag": "5.10.0",
"pullPolicy": "IfNotPresent"
},
"securityContext": {
Expand Down Expand Up @@ -2661,15 +2661,15 @@
"port": 50000,
"image": {
"repository": "private-registry.nginx.com/nap/waf-enforcer",
"tag": "5.9.0",
"tag": "5.10.0",
"pullPolicy": "IfNotPresent"
},
"securityContext": {}
},
"configManager": {
"image": {
"repository": "private-registry.nginx.com/nap/waf-config-mgr",
"tag": "5.9.0",
"tag": "5.10.0",
"pullPolicy": "IfNotPresent"
},
"securityContext": {
Expand Down
4 changes: 2 additions & 2 deletions charts/nginx-ingress/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions charts/tests/__snapshots__/helmunit_test.snap
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:

Expand Down Expand Up @@ -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
Expand All @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion tests/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Loading