update base image of nginx to 1.21.6 (#9257)

* add workflow dispatch and update nginx base Signed-off-by: James Strong <strong.james.e@gmail.com> * e2e were failing, added a go mod tidy Signed-off-by: James Strong <strong.james.e@gmail.com> * e2e were failing, added a go mod tidy Signed-off-by: James Strong <strong.james.e@gmail.com> * push mod and sum from main Signed-off-by: James Strong <strong.james.e@gmail.com> * Update NGINX_BASE Co-authored-by: Jintao Zhang <tao12345666333@163.com> Signed-off-by: James Strong <strong.james.e@gmail.com> Co-authored-by: Jintao Zhang <tao12345666333@163.com>
kubernetes · Nov 6, 2022 · 4bd7e17 · 4bd7e17
1 parent 490ecff
commit 4bd7e17
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -9,6 +9,13 @@ on:
     branches:
       - main
 
+  workflow_dispatch:
+    inputs:
+      run_e2e:
+        description: 'Force e2e to run'
+        required: true
+        type: boolean
+
 permissions:
   contents: read
 
@@ -40,9 +47,11 @@ jobs:
               - 'rootfs/**/*'
               - 'TAG'
               - 'test/e2e/**/*'
+              - 'NGINX_BASE'
             charts:
               - 'charts/ingress-nginx/Chart.yaml'
               - 'charts/ingress-nginx/**/*'
+              - 'NGINX_BASE'
 
 
   security:
@@ -126,7 +135,7 @@ jobs:
       - changes
       - build
     if: |
-      (needs.changes.outputs.charts == 'true')
+      (needs.changes.outputs.charts == 'true') || ${{ inputs.run_e2e }} 
 
     strategy:
       matrix:
@@ -209,7 +218,7 @@ jobs:
       - changes
       - build
     if: |
-      (needs.changes.outputs.go == 'true')
+      (needs.changes.outputs.go == 'true') || ${{ inputs.run_e2e }} 
 
     strategy:
       matrix:
@@ -266,7 +275,7 @@ jobs:
       - changes
       - build
     if: |
-      (needs.changes.outputs.go == 'true')
+      (needs.changes.outputs.go == 'true') || ${{ inputs.run_e2e }} 
 
     strategy:
       matrix:

diff --git a/NGINX_BASE b/NGINX_BASE
@@ -1 +1 @@
-registry.k8s.io/ingress-nginx/nginx:9fdbef829c327b95a3c6d6816a301df41bda997f@sha256:46c27294e467f46d0006ad1eb5fd3f7005eb3cbd00dd43be2ed9b02edfc6e828
+registry.k8s.io/ingress-nginx/nginx:0b5e0685112e4537ee20a0bdbba451e9f6158aa3@sha256:3f5e28bb248d5170e77b77fc2a1a385724aeff41a0b34b5afad7dd9cf93de000