Skip to content

Commit bce6477

Browse files
AlexFenlonAlexFenlon
committed
Merge remote-tracking branch 'refs/remotes/origin/main' into tests/add-more-mgmt-configmap-tests
2 parents a0c3531 + f92a20a commit bce6477

26 files changed

+372
-176
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",

‎.github/workflows/build-single-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
cat $GITHUB_OUTPUT
5858
5959
- name: Setup Golang Environment
60-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
60+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
6161
with:
6262
go-version-file: go.mod
6363

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
shell: bash --noprofile --norc -o pipefail {0}
8181

8282
- name: Setup Golang Environment
83-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
83+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
8484
with:
8585
go-version-file: go.mod
8686

@@ -180,7 +180,7 @@ jobs:
180180
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
181181

182182
- name: Setup Golang Environment
183-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
183+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
184184
with:
185185
go-version-file: go.mod
186186

@@ -217,7 +217,7 @@ jobs:
217217
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
218218

219219
- name: Setup Golang Environment
220-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
220+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
221221
with:
222222
go-version-file: go.mod
223223
if: ${{ needs.checks.outputs.binary_cache_hit != 'true' }}
@@ -255,7 +255,7 @@ jobs:
255255
fetch-depth: 0
256256

257257
- name: Setup Golang Environment
258-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
258+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
259259
with:
260260
go-version-file: go.mod
261261
if: ${{ needs.checks.outputs.binary_cache_hit != 'true' }}

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070

7171
# Initializes the CodeQL tools for scanning.
7272
- name: Initialize CodeQL
73-
uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
73+
uses: github/codeql-action/init@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
7474
with:
7575
languages: ${{ matrix.language }}
7676
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -81,15 +81,15 @@ jobs:
8181
# queries: security-extended,security-and-quality
8282

8383
- name: Setup Golang Environment
84-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
84+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
8585
with:
8686
go-version-file: go.mod
8787
if: matrix.language == 'go'
8888

8989
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
9090
# If this step fails, then you should remove it and run the build manually (see below)
9191
- name: Autobuild
92-
uses: github/codeql-action/autobuild@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
92+
uses: github/codeql-action/autobuild@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
9393

9494
# ℹ️ Command-line programs to run using the OS shell.
9595
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -102,6 +102,6 @@ jobs:
102102
# ./location_of_script_within_repo/buildscript.sh
103103

104104
- name: Perform CodeQL Analysis
105-
uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
105+
uses: github/codeql-action/analyze@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
106106
with:
107107
category: "/language:${{matrix.language}}"

‎.github/workflows/image-promotion.yml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5252

5353
- name: Setup Golang Environment
54-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
54+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
5555
with:
5656
go-version-file: go.mod
5757

@@ -123,7 +123,7 @@ jobs:
123123
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
124124

125125
- name: Setup Golang Environment
126-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
126+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
127127
with:
128128
go-version-file: go.mod
129129

@@ -143,7 +143,7 @@ jobs:
143143
fi
144144
145145
- name: Upload SARIF file
146-
uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
146+
uses: github/codeql-action/upload-sarif@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
147147
if: steps.check-sarif.outputs.sarif_has_results == 'true'
148148
with:
149149
sarif_file: govulncheck.sarif
@@ -159,7 +159,7 @@ jobs:
159159
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
160160

161161
- name: Setup Golang Environment
162-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
162+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
163163
with:
164164
go-version-file: go.mod
165165
if: ${{ needs.checks.outputs.binary_cache_hit != 'true' }}
@@ -385,7 +385,7 @@ jobs:
385385
scan-docker-oss:
386386
name: Scan ${{ matrix.image }}-${{ matrix.target }}
387387
runs-on: ubuntu-24.04
388-
needs: [checks]
388+
needs: [checks, tag-candidate]
389389
permissions:
390390
contents: read
391391
id-token: write
@@ -467,14 +467,14 @@ jobs:
467467
overwrite: true
468468

469469
- name: Upload Scan results to GitHub Security tab
470-
uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
470+
uses: github/codeql-action/upload-sarif@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
471471
with:
472472
sarif_file: "${{ steps.directory.outputs.directory }}/"
473473

474474
scan-docker-plus:
475475
name: Scan ${{ matrix.image }}-${{ matrix.target }}
476476
runs-on: ubuntu-24.04
477-
needs: [checks]
477+
needs: [checks, tag-candidate]
478478
permissions:
479479
contents: read
480480
id-token: write
@@ -556,14 +556,14 @@ jobs:
556556
overwrite: true
557557

558558
- name: Upload Scan results to GitHub Security tab
559-
uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
559+
uses: github/codeql-action/upload-sarif@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
560560
with:
561561
sarif_file: "${{ steps.directory.outputs.directory }}/"
562562

563563
scan-docker-nap:
564564
name: Scan ${{ matrix.image }}-${{ matrix.target }}-${{ matrix.nap_modules }}
565565
runs-on: ubuntu-24.04
566-
needs: [checks]
566+
needs: [checks, tag-candidate]
567567
permissions:
568568
contents: read
569569
id-token: write
@@ -652,9 +652,10 @@ jobs:
652652
overwrite: true
653653

654654
- name: Upload Scan results to GitHub Security tab
655-
uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
655+
uses: github/codeql-action/upload-sarif@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
656656
with:
657657
sarif_file: "${{ steps.directory.outputs.directory }}/"
658+
continue-on-error: true
658659

659660
update-release-draft:
660661
name: Update Release Draft

‎.github/workflows/lint-format.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2828

2929
- name: Setup Golang Environment
30-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
30+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
3131
with:
3232
go-version-file: go.mod
3333

@@ -47,7 +47,7 @@ jobs:
4747
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4848

4949
- name: Setup Golang Environment
50-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
50+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
5151
with:
5252
go-version-file: go.mod
5353

0 commit comments

Comments
 (0)