Merge branch 'main' into feat/use-cluster-ip-ingress

nginx · Jan 5, 2024 · ba94de9 · ba94de9
2 parents 838f3b7 + 99c9212
commit ba94de9
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/.github/actions/smoke-tests/action.yaml b/.github/actions/smoke-tests/action.yaml
@@ -3,7 +3,7 @@ name: Run Smoke Tests
 description: Run Smoke Tests for the project
 
 inputs:
-  go_md5:
+  go-md5:
     required: true
     type: string
   k8s-version:
@@ -42,7 +42,7 @@ runs:
       uses: actions/cache@v3
       with:
         path: ${{ github.workspace }}/dist
-        key: nginx-ingress-${{ inputs.go_md5 }}
+        key: nginx-ingress-${{ inputs.go-md5 }}
 
     - name: Ingress type
       id: ingress-type

diff --git a/.github/workflows/build-oss.yml b/.github/workflows/build-oss.yml
@@ -9,7 +9,7 @@ on:
       image:
         required: true
         type: string
-      go_md5:
+      go-md5:
         required: true
         type: string
       tag:
@@ -45,7 +45,7 @@ jobs:
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         with:
           path: ${{ github.workspace }}/dist
-          key: nginx-ingress-${{ inputs.go_md5 }}
+          key: nginx-ingress-${{ inputs.go-md5 }}
 
       - name: Setup QEMU
         uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0

diff --git a/.github/workflows/build-plus.yml b/.github/workflows/build-plus.yml
@@ -12,7 +12,7 @@ on:
       target:
         required: true
         type: string
-      go_md5:
+      go-md5:
         required: true
         type: string
       nap_modules:
@@ -46,7 +46,7 @@ jobs:
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         with:
           path: ${{ github.workspace }}/dist
-          key: nginx-ingress-${{ inputs.go_md5 }}
+          key: nginx-ingress-${{ inputs.go-md5 }}
 
       - name: Setup QEMU
         uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -341,7 +341,7 @@ jobs:
   smoke-tests:
     name: Smoke Tests
     runs-on: ubuntu-22.04
-    needs: setup-matrix
+    needs: [checks, setup-matrix]
     strategy:
       fail-fast: false
       matrix: ${{ fromJSON(needs.setup-matrix.outputs.matrix) }}
@@ -359,6 +359,7 @@ jobs:
           nginx-crt: ${{ contains(matrix.images.image, 'nap') && secrets.NGINX_AP_CRT || secrets.NGINX_CRT }}
           nginx-key: ${{ contains(matrix.images.image, 'nap') && secrets.NGINX_AP_KEY || secrets.NGINX_KEY }}
           azure-ad-secret: ${{ secrets.AZURE_AD_AUTOMATION }}
+          go-md5: ${{ needs.checks.outputs.go_code_md5 }}
 
       - name: Upload Test Results
         uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
@@ -383,7 +384,7 @@ jobs:
     with:
       platforms: ${{ matrix.platforms }}
       image: ${{ matrix.image }}
-      go_md5: ${{ needs.checks.outputs.go_code_md5 }}
+      go-md5: ${{ needs.checks.outputs.go_code_md5 }}
     permissions:
       contents: read
       actions: read
@@ -410,7 +411,7 @@ jobs:
       platforms: ${{ matrix.platforms }}
       image: ${{ matrix.image }}
       target: ${{ matrix.target }}
-      go_md5: ${{ needs.checks.outputs.go_code_md5 }}
+      go-md5: ${{ needs.checks.outputs.go_code_md5 }}
       release-url: ${{ needs.release-notes.outputs.release-url }}
     permissions:
       contents: read
@@ -433,7 +434,7 @@ jobs:
       platforms: ${{ matrix.platforms }}
       image: ${{ matrix.image }}
       target: ${{ matrix.target }}
-      go_md5: ${{ needs.checks.outputs.go_code_md5 }}
+      go-md5: ${{ needs.checks.outputs.go_code_md5 }}
       nap_modules: ${{ matrix.nap_modules }}
       release-url: ${{ needs.release-notes.outputs.release-url }}
     permissions:

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -23,6 +23,6 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: "Dependency Review"
-        uses: actions/dependency-review-action@01bc87099ba56df1e897b6874784491ea6309bc4 # v3.1.4
+        uses: actions/dependency-review-action@c74b580d73376b7750d3d2a50bfb8adc2c937507 # v3.1.5
         with:
           config-file: "nginxinc/k8s-common/dependency-review-config.yml@main"
diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -4,9 +4,9 @@
 #
 #    pip-compile --generate-hashes --resolver=backtracking requirements.txt
 #
-attrs==23.1.0 \
-    --hash=sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04 \
-    --hash=sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015
+attrs==23.2.0 \
+    --hash=sha256:935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30 \
+    --hash=sha256:99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1
     # via -r requirements.txt
 cachetools==5.3.2 \
     --hash=sha256:086ee420196f7b2ab9ca2db2520aca326318b68fe5ba8bc4d49cca91add450f2 \
@@ -421,9 +421,9 @@ pyparsing==3.1.1 \
     --hash=sha256:32c7c0b711493c72ff18a981d24f28aaf9c1fb7ed5e9667c9e84e3db623bdbfb \
     --hash=sha256:ede28a1a32462f5a9705e07aea48001a08f7cf81a021585011deba701581a0db
     # via -r requirements.txt
-pytest==7.4.3 \
-    --hash=sha256:0d009c083ea859a71b76adf7c1d502e4bc170b80a8ef002da5806527b9591fac \
-    --hash=sha256:d989d136982de4e3b29dabcc838ad581c64e8ed52c11fbe86ddebd9da0818cd5
+pytest==7.4.4 \
+    --hash=sha256:2cf0005922c6ace4a3e2ec8b4080eb0d9753fdc93107415332f50ce9e7994280 \
+    --hash=sha256:b090cdf5ed60bf4c45261be03239c2c1c22df034fbffe691abe93cd80cea01d8
     # via
     #   -r requirements.txt
     #   pytest-html