Skip to content

Commit ed2c73f

Browse files
author
Jim Ryan
authored
Merge branch 'main' into chore/add-report-marker
2 parents b209eeb + d711d31 commit ed2c73f

28 files changed

+793
-746
lines changed

‎.github/data/patch-images.json‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
[
2+
{
3+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-ingress",
4+
"source_os": "debian",
5+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-ingress",
6+
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
7+
},
8+
{
9+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-ingress",
10+
"source_os": "alpine",
11+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-ingress",
12+
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
13+
},
14+
{
15+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-ingress",
16+
"source_os": "ubi",
17+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-ingress",
18+
"platforms": "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
19+
},
20+
{
21+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress",
22+
"source_os": "debian",
23+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress",
24+
"platforms": "linux/arm64, linux/amd64"
25+
},
26+
{
27+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress",
28+
"source_os": "mktpl",
29+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress",
30+
"platforms": "linux/arm64, linux/amd64"
31+
},
32+
{
33+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress",
34+
"source_os": "alpine",
35+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress",
36+
"platforms": "linux/arm64, linux/amd64"
37+
},
38+
{
39+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress",
40+
"source_os": "ubi",
41+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress",
42+
"platforms": "linux/arm64, linux/amd64"
43+
},
44+
{
45+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress",
46+
"source_os": "debian",
47+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress",
48+
"platforms": "linux/amd64"
49+
},
50+
{
51+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress",
52+
"source_os": "mktpl",
53+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress",
54+
"platforms": "linux/amd64"
55+
},
56+
{
57+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress",
58+
"source_os": "ubi",
59+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress",
60+
"platforms": "linux/amd64"
61+
},
62+
{
63+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap-v5/nginx-plus-ingress",
64+
"source_os": "debian",
65+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap-v5/nginx-plus-ingress",
66+
"platforms": "linux/amd64"
67+
},
68+
{
69+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap-v5/nginx-plus-ingress",
70+
"source_os": "ubi",
71+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap-v5/nginx-plus-ingress",
72+
"platforms": "linux/amd64"
73+
},
74+
{
75+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos/nginx-plus-ingress",
76+
"source_os": "debian",
77+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos/nginx-plus-ingress",
78+
"platforms": "linux/amd64"
79+
},
80+
{
81+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos/nginx-plus-ingress",
82+
"source_os": "mktpl",
83+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos/nginx-plus-ingress",
84+
"platforms": "linux/amd64"
85+
},
86+
{
87+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos/nginx-plus-ingress",
88+
"source_os": "ubi",
89+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos/nginx-plus-ingress",
90+
"platforms": "linux/amd64"
91+
},
92+
{
93+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos-nap/nginx-plus-ingress",
94+
"source_os": "debian",
95+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos-nap/nginx-plus-ingress",
96+
"platforms": "linux/amd64"
97+
},
98+
{
99+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos-nap/nginx-plus-ingress",
100+
"source_os": "mktpl",
101+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos-nap/nginx-plus-ingress",
102+
"platforms": "linux/amd64"
103+
},
104+
{
105+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos-nap/nginx-plus-ingress",
106+
"source_os": "ubi",
107+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos-nap/nginx-plus-ingress",
108+
"platforms": "linux/amd64"
109+
}
110+
]

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,11 @@ jobs:
168168
- name: Checkout Repository
169169
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
170170

171+
- name: Setup Golang Environment
172+
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
173+
with:
174+
go-version-file: go.mod
175+
171176
- name: Check if go.mod and go.sum are up to date
172177
run: go mod tidy && git diff --exit-code -- go.mod go.sum
173178

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ jobs:
321321
github_public_registry: true
322322
source_tag: ${{ needs.checks.outputs.stable_tag }}
323323
target_tag: "edge"
324+
branch: ${{ github.ref_name }}
324325
dry_run: false
325326
permissions:
326327
contents: read
@@ -342,6 +343,7 @@ jobs:
342343
az_mktpl_registry: false
343344
source_tag: ${{ needs.checks.outputs.stable_tag }}
344345
target_tag: "edge"
346+
branch: ${{ github.ref_name }}
345347
dry_run: false
346348
permissions:
347349
contents: read
@@ -459,7 +461,7 @@ jobs:
459461
summary: true
460462

461463
- name: Upload Scan Results to Github Artifacts
462-
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
464+
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
463465
with:
464466
name: "${{ github.ref_name }}-${{ steps.directory.outputs.directory }}"
465467
path: "${{ steps.directory.outputs.directory }}/"
@@ -549,7 +551,7 @@ jobs:
549551
summary: true
550552

551553
- name: Upload Scan Results to Github Artifacts
552-
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
554+
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
553555
with:
554556
name: "${{ github.ref_name }}-${{ steps.directory.outputs.directory }}"
555557
path: "${{ steps.directory.outputs.directory }}/"
@@ -646,7 +648,7 @@ jobs:
646648
summary: true
647649

648650
- name: Upload Scan Results to Github Artifacts
649-
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
651+
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
650652
with:
651653
name: "${{ github.ref_name }}-${{ steps.directory.outputs.directory }}"
652654
path: "${{ steps.directory.outputs.directory }}/"

‎.github/workflows/oss-release.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ on:
2424
target_tag:
2525
required: true
2626
type: string
27+
branch:
28+
required: false
29+
type: string
30+
default: "main"
2731
dry_run:
2832
type: boolean
2933
default: false
@@ -50,6 +54,10 @@ on:
5054
target_tag:
5155
required: true
5256
type: string
57+
branch:
58+
required: false
59+
type: string
60+
default: "main"
5361
dry_run:
5462
type: boolean
5563
default: false
@@ -72,6 +80,8 @@ jobs:
7280
steps:
7381
- name: Checkout Repository
7482
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
83+
with:
84+
ref: ${{ inputs.branch }}
7585

7686
- name: Authenticate to Google Cloud
7787
id: gcr-auth
@@ -108,6 +118,8 @@ jobs:
108118
steps:
109119
- name: Checkout Repository
110120
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
121+
with:
122+
ref: ${{ inputs.branch }}
111123

112124
- name: Authenticate to Google Cloud
113125
id: gcr-auth
@@ -155,6 +167,8 @@ jobs:
155167
steps:
156168
- name: Checkout Repository
157169
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
170+
with:
171+
ref: ${{ inputs.branch }}
158172

159173
- name: Authenticate to Google Cloud
160174
id: gcr-auth
@@ -197,6 +211,8 @@ jobs:
197211
steps:
198212
- name: Checkout Repository
199213
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
214+
with:
215+
ref: ${{ inputs.branch }}
200216

201217
- name: Authenticate to Google Cloud
202218
id: gcr-auth
@@ -241,6 +257,8 @@ jobs:
241257
steps:
242258
- name: Checkout Repository
243259
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
260+
with:
261+
ref: ${{ inputs.branch }}
244262

245263
- name: Authenticate to Google Cloud
246264
id: gcr-auth

‎.github/workflows/plus-release.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ on:
2424
target_tag:
2525
required: true
2626
type: string
27+
branch:
28+
required: false
29+
type: string
30+
default: "main"
2731
dry_run:
2832
type: boolean
2933
default: false
@@ -50,6 +54,10 @@ on:
5054
target_tag:
5155
required: true
5256
type: string
57+
branch:
58+
required: false
59+
type: string
60+
default: "main"
5361
dry_run:
5462
type: boolean
5563
default: false
@@ -72,6 +80,8 @@ jobs:
7280
steps:
7381
- name: Checkout Repository
7482
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
83+
with:
84+
ref: ${{ inputs.branch }}
7585

7686
- name: Authenticate to Google Cloud
7787
id: gcr-auth
@@ -108,6 +118,8 @@ jobs:
108118
steps:
109119
- name: Checkout Repository
110120
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
121+
with:
122+
ref: ${{ inputs.branch }}
111123

112124
- name: Authenticate to Google Cloud
113125
id: gcr-auth
@@ -159,6 +171,8 @@ jobs:
159171
steps:
160172
- name: Checkout Repository
161173
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
174+
with:
175+
ref: ${{ inputs.branch }}
162176

163177
- name: Authenticate to Google Cloud
164178
id: gcr-priv-auth
@@ -198,6 +212,8 @@ jobs:
198212
steps:
199213
- name: Checkout Repository
200214
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
215+
with:
216+
ref: ${{ inputs.branch }}
201217

202218
- name: Authenticate to Google Cloud
203219
id: gcr-auth
@@ -245,6 +261,8 @@ jobs:
245261
steps:
246262
- name: Checkout Repository
247263
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
264+
with:
265+
ref: ${{ inputs.branch }}
248266

249267
- name: Authenticate to Google Cloud
250268
id: gcr-auth

‎.github/workflows/regression.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,12 @@ jobs:
8383
unit-tests:
8484
name: Unit Tests
8585
runs-on: ubuntu-24.04
86+
needs: [checks]
8687
steps:
8788
- name: Checkout Repository
8889
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
90+
with:
91+
ref: ${{ needs.checks.outputs.branch }}
8992

9093
- name: Setup Golang Environment
9194
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
@@ -271,7 +274,7 @@ jobs:
271274
test-image: "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/test-runner:${{ hashFiles('./tests/requirements.txt') || 'latest' }}"
272275

273276
- name: Upload Test Results
274-
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
277+
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
275278
with:
276279
name: ${{ steps.regression-tests.outputs.test-results-name }}
277280
path: ${{ steps.regression-tests.outputs.test-results-path }}
@@ -302,6 +305,7 @@ jobs:
302305
quay_public_registry: true
303306
github_public_registry: true
304307
source_tag: ${{ needs.checks.outputs.stable_tag }}
308+
branch: ${{ needs.checks.outputs.branch }}
305309
target_tag: "nightly"
306310
dry_run: false
307311
permissions:
@@ -323,6 +327,7 @@ jobs:
323327
az_mktpl_registry: false
324328
source_tag: ${{ needs.checks.outputs.stable_tag }}
325329
target_tag: "nightly"
330+
branch: ${{ needs.checks.outputs.branch }}
326331
dry_run: false
327332
permissions:
328333
contents: read

‎.github/workflows/release-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
.github/scripts/release-notes-update.sh ${{ github.event.inputs.new_version }} ${{ github.event.inputs.new_helm_version }} "${{ github.event.inputs.k8s_versions }}" "${{ github.event.inputs.release_date }}"
7171
7272
- name: Create Pull Request
73-
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6.1.0
73+
uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 # v7.0.0
7474
with:
7575
token: ${{ secrets.NGINX_PAT }}
7676
commit-message: Release ${{ github.event.inputs.new_version }}

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ jobs:
154154
github_public_registry: true
155155
source_tag: ${{ needs.variables.outputs.source_tag }}
156156
target_tag: ${{ matrix.tag }}
157+
branch: ${{ inputs.release_branch }}
157158
dry_run: ${{ inputs.dry_run }}
158159
permissions:
159160
contents: read
@@ -182,6 +183,7 @@ jobs:
182183
az_mktpl_registry: false
183184
source_tag: ${{ needs.variables.outputs.source_tag }}
184185
target_tag: ${{ inputs.nic_version }}
186+
branch: ${{ inputs.release_branch }}
185187
dry_run: ${{ inputs.dry_run }}
186188
permissions:
187189
contents: read
@@ -208,6 +210,7 @@ jobs:
208210
az_mktpl_registry: false
209211
source_tag: ${{ needs.variables.outputs.source_tag }}
210212
target_tag: ${{ inputs.nic_version }}
213+
branch: ${{ inputs.release_branch }}
211214
dry_run: ${{ inputs.dry_run }}
212215
permissions:
213216
contents: read
@@ -233,6 +236,7 @@ jobs:
233236
az_mktpl_registry: false
234237
source_tag: ${{ needs.variables.outputs.source_tag }}
235238
target_tag: ${{ inputs.nic_version }}
239+
branch: ${{ inputs.release_branch }}
236240
dry_run: ${{ inputs.dry_run }}
237241
permissions:
238242
contents: read
@@ -258,6 +262,7 @@ jobs:
258262
az_mktpl_registry: true
259263
source_tag: ${{ needs.variables.outputs.source_tag }}
260264
target_tag: ${{ inputs.nic_version }}
265+
branch: ${{ inputs.release_branch }}
261266
dry_run: ${{ inputs.dry_run }}
262267
permissions:
263268
contents: read
@@ -485,7 +490,7 @@ jobs:
485490
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
486491

487492
- name: Azure Upload Release Packages
488-
uses: azure/CLI@965c8d7571d2231a54e321ddd07f7b10317f34d9 # v2.0.0
493+
uses: azure/CLI@089eac9d8cc39f5d003e94f8b65efc51076c9cbd # v2.1.0
489494
with:
490495
inlineScript: |
491496
for i in $(find tarballs -type f); do

0 commit comments

Comments
 (0)