Skip to content

Commit 4bd7e17

Browse files
update base image of nginx to 1.21.6 (#9257)
* add workflow dispatch and update nginx base Signed-off-by: James Strong <[email protected]> * e2e were failing, added a go mod tidy Signed-off-by: James Strong <[email protected]> * e2e were failing, added a go mod tidy Signed-off-by: James Strong <[email protected]> * push mod and sum from main Signed-off-by: James Strong <[email protected]> * Update NGINX_BASE Co-authored-by: Jintao Zhang <[email protected]> Signed-off-by: James Strong <[email protected]> Co-authored-by: Jintao Zhang <[email protected]>
1 parent 490ecff commit 4bd7e17

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

.github/workflows/ci.yaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ on:
99
branches:
1010
- main
1111

12+
workflow_dispatch:
13+
inputs:
14+
run_e2e:
15+
description: 'Force e2e to run'
16+
required: true
17+
type: boolean
18+
1219
permissions:
1320
contents: read
1421

@@ -40,9 +47,11 @@ jobs:
4047
- 'rootfs/**/*'
4148
- 'TAG'
4249
- 'test/e2e/**/*'
50+
- 'NGINX_BASE'
4351
charts:
4452
- 'charts/ingress-nginx/Chart.yaml'
4553
- 'charts/ingress-nginx/**/*'
54+
- 'NGINX_BASE'
4655
4756
4857
security:
@@ -126,7 +135,7 @@ jobs:
126135
- changes
127136
- build
128137
if: |
129-
(needs.changes.outputs.charts == 'true')
138+
(needs.changes.outputs.charts == 'true') || ${{ inputs.run_e2e }}
130139
131140
strategy:
132141
matrix:
@@ -209,7 +218,7 @@ jobs:
209218
- changes
210219
- build
211220
if: |
212-
(needs.changes.outputs.go == 'true')
221+
(needs.changes.outputs.go == 'true') || ${{ inputs.run_e2e }}
213222
214223
strategy:
215224
matrix:
@@ -266,7 +275,7 @@ jobs:
266275
- changes
267276
- build
268277
if: |
269-
(needs.changes.outputs.go == 'true')
278+
(needs.changes.outputs.go == 'true') || ${{ inputs.run_e2e }}
270279
271280
strategy:
272281
matrix:

NGINX_BASE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
registry.k8s.io/ingress-nginx/nginx:9fdbef829c327b95a3c6d6816a301df41bda997f@sha256:46c27294e467f46d0006ad1eb5fd3f7005eb3cbd00dd43be2ed9b02edfc6e828
1+
registry.k8s.io/ingress-nginx/nginx:0b5e0685112e4537ee20a0bdbba451e9f6158aa3@sha256:3f5e28bb248d5170e77b77fc2a1a385724aeff41a0b34b5afad7dd9cf93de000

0 commit comments

Comments
 (0)