8000 images to patch sourced from json file (#6331) · nginx/kubernetes-ingress@55d5e29 · GitHub
[go: up one dir, main page]

Skip to content

Commit 55d5e29

Browse files
authored
images to patch sourced from json file (#6331)
1 parent 6b05d98 commit 55d5e29

File tree

7 files changed

+272
-164
lines changed

7 files changed

+272
-164
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/image-promotion.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ jobs:
319319
github_public_registry: true
320320
source_tag: ${{ needs.checks.outputs.stable_tag }}
321321
target_tag: "edge"
322+
branch: ${{ github.ref_name }}
322323
dry_run: false
323324
permissions:
324325
contents: read
@@ -340,6 +341,7 @@ jobs:
340341
az_mktpl_registry: false
341342
source_tag: ${{ needs.checks.outputs.stable_tag }}
342343
target_tag: "edge"
344+
branch: ${{ github.ref_name }}
343345
dry_run: false
344346
permissions:
345347
contents: read

.github/workflows/oss-release.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ on:
2424
target_tag:
2525
required: true
2626
type: string
27-
short_target_tag:
27+
branch:
28+
required: false
2829
type: string
29-
default: ''
30+
default: "main"
3031
dry_run:
3132
type: boolean
3233
default: false
@@ -53,9 +54,10 @@ on:
5354
target_tag:
5455
required: true
5556
type: string
56-
short_target_tag:
57+
branch:
58+
required: false
5759
type: string
58-
default: ''
60+
default: "main"
5961
dry_run:
6062
type: boolean
6163
default: false
@@ -78,6 +80,8 @@ jobs:
7880
steps:
7981
- name: Checkout Repository
8082
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
83+
with:
84+
ref: ${{ inputs.branch }}
8185

8286
- name: Authenticate to Google Cloud
8387
id: gcr-auth
@@ -117,6 +121,8 @@ jobs:
117121
steps:
118122
- name: Checkout Repository
119123
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
124+
with:
125+
ref: ${{ inputs.branch }}
120126

121127
- name: Authenticate to Google Cloud
122128
id: gcr-auth
@@ -167,6 +173,8 @@ jobs:
167173
steps:
168174
- name: Checkout Repository
169175
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
176+
with:
177+
ref: ${{ inputs.branch }}
170178

171179
- name: Authenticate to Google Cloud
172180
id: gcr-auth
@@ -212,6 +220,8 @@ jobs:
212220
steps:
213221
- name: Checkout Repository
214222
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
223+
with:
224+
ref: ${{ inputs.branch }}
215225

216226
- name: Authenticate to Google Cloud
217227
id: gcr-auth
@@ -259,6 +269,8 @@ jobs:
259269
steps:
260270
- name: Checkout Repository
261271
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
272+
with:
273+
ref: ${{ inputs.branch }}
262274

263275
- name: Authenticate to Google Cloud
264276
id: gcr-auth

.github/workflows/plus-release.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ on:
2424
target_tag:
2525
required: true
2626
type: string
27-
short_target_tag:
27+
branch:
28+
required: false
2829
type: string
29-
default: ''
30+
default: "main"
3031
dry_run:
3132
type: boolean
3233
default: false
@@ -53,9 +54,10 @@ on:
5354
target_tag:
5455
required: true
5556
type: string
56-
short_target_tag:
57+
branch:
58+
required: false
5759
type: string
58-
default: ''
60+
default: "main"
5961
dry_run:
6062
type: boolean
6163
default: false
@@ -78,6 +80,8 @@ jobs:
7880
steps:
7981
- name: Checkout Repository
8082
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
83+
with:
84+
ref: ${{ inputs.branch }}
8185

8286
- name: Authenticate to Google Cloud
8387
id: gcr-auth
@@ -117,6 +121,8 @@ jobs:
117121
steps:
118122
- name: Checkout Repository
119123
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
124+
with:
125+
ref: ${{ inputs.branch }}
120126

121127
- name: Authenticate to Google Cloud
122128
id: gcr-auth
@@ -171,6 +177,8 @@ jobs:
171177
steps:
172178
- name: Checkout Repository
173179
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
180+
with:
181+
ref: ${{ inputs.branch }}
174182

175183
- name: Authenticate to Google Cloud
176184
id: gcr-priv-auth
@@ -213,6 +221,8 @@ jobs:
213221
steps:
214222
- name: Checkout Repository
215223
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
224+
with:
225+
ref: ${{ inputs.branch }}
216226

217227
- name: Authenticate to Google Cloud
218228
id: gcr-auth
@@ -260,6 +270,8 @@ jobs:
260270
steps:
261271
- name: Checkout Repository
262272
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
273+
with:
274+
ref: ${{ inputs.branch }}
263275

264276
- name: Authenticate to Google Cloud
265277
id: gcr-auth

.github/workflows/regression.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,30 @@ jobs:
8080
echo stable_tag: ${{ steps.vars.outputs.stable_tag }}
8181
echo branch: ${{ steps.vars.outputs.branch }}
8282
83+
unit-tests:
84+
name: Unit Tests
85+
runs-on: ubuntu-24.04
86+
needs: [checks]
87+
steps:
88+
- name: Checkout Repository
89+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
90+
with:
91+
ref: ${{ needs.checks.outputs.branch }}
92+
93+
- name: Setup Golang Environment
94+
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
95+
with:
96+
go-version-file: go.mod
97+
98+
- name: Run Tests
99+
run: make cover
100+
101+
- name: Upload coverage to Codecov
102+
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
103+
with:
104+
files: ./coverage.txt
105+
token: ${{ secrets.CODECOV_TOKEN }} # required
106+
83107
helm-tests:
84108
name: Helm Tests ${{ matrix.base-os }}
85109
runs-on: ubuntu-22.04
@@ -280,6 +304,7 @@ jobs:
280304
quay_public_registry: true
281305
github_public_registry: true
282306
source_tag: ${{ needs.checks.outputs.stable_tag }}
307+
branch: ${{ needs.checks.outputs.branch }}
283308
target_tag: "nightly"
284309
dry_run: false
285310
permissions:
@@ -301,6 +326,7 @@ jobs:
301326
az_mktpl_registry: false
302327
source_tag: ${{ needs.checks.outputs.stable_tag }}
303328
target_tag: "nightly"
329+
branch: ${{ needs.checks.outputs.branch }}
304330
dry_run: false
305331
permissions:
306332
contents: read

0 commit comments

Comments
 (0)
0