8000 Merge branch 'main' into feat/use-cluster-ip-ingress · nginx/kubernetes-ingress@ba94de9 · GitHub
[go: up one dir, main page]
Skip to content

Commit ba94de9

Browse files
author
Jim Ryan
authored
Merge branch 'main' into feat/use-cluster-ip-ingress
2 parents 838f3b7 + 99c9212 commit ba94de9

File tree

6 files changed

+18
-17
lines changed

6 files changed

+18
-17
lines changed

‎.github/actions/smoke-tests/action.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Run Smoke Tests
33
description: Run Smoke Tests for the project
44

55
inputs:
6-
go_md5:
6+
go-md5:
77
required: true
88
type: string
99
k8s-version:
@@ -42,7 +42,7 @@ runs:
4242
uses: actions/cache@v3
4343
with:
4444
path: ${{ github.workspace }}/dist
45-
key: nginx-ingress-${{ inputs.go_md5 }}
45+
key: nginx-ingress-${{ inputs.go-md5 }}
4646

4747
- name: Ingress type
4848
id: ingress-type

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
image:
1010
required: true
1111
type: string
12-
8000 go_md5:
12+
go-md5:
1313
required: true
1414
type: string
1515
tag:
@@ -45,7 +45,7 @@ jobs:
4545
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
4646
with:
4747
path: ${{ github.workspace }}/dist
48-
key: nginx-ingress-${{ inputs.go_md5 }}
48+
key: nginx-ingress-${{ inputs.go-md5 }}
4949

5050
- name: Setup QEMU
5151
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
target:
1313
required: true
1414
type: string
15-
go_md5:
15+
go-md5:
1616
required: true
1717
type: string
1818
nap_modules:
@@ -46,7 +46,7 @@ jobs:
4646
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
4747
with:
4848
path: ${{ github.workspace }}/dist
49-
key: nginx-ingress-${{ inputs.go_md5 }}
49+
key: nginx-ingress-${{ inputs.go-md5 }}
5050

5151
- name: Setup QEMU
5252
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ jobs:
341341
smoke-tests:
342342
name: Smoke Tests
343343
runs-on: ubuntu-22.04
344-
needs: setup-matrix
344+
needs: [checks, setup-matrix]
345345
strategy:
346346
fail-fast: false
347347
matrix: ${{ fromJSON(needs.setup-matrix.outputs.matrix) }}
@@ -359,6 +359,7 @@ jobs:
359359
nginx-crt: ${{ contains(matrix.images.image, 'nap') && secrets.NGINX_AP_CRT || secrets.NGINX_CRT }}
360360
nginx-key: ${{ contains(matrix.images.image, 'nap') && secrets.NGINX_AP_KEY || secrets.NGINX_KEY }}
361361
azure-ad-secret: ${{ secrets.AZURE_AD_AUTOMATION }}
362+
go-md5: ${{ needs.checks.outputs.go_code_md5 }}
362363

363364
- name: Upload Test Results
364365
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
@@ -383,7 +384,7 @@ jobs:
383384
with:
384385
platforms: ${{ matrix.platforms }}
385386
image: ${{ matrix.image }}
386-
go_md5: ${{ needs.checks.outputs.go_code_md5 }}
387+
go-md5: ${{ needs.checks.outputs.go_code_md5 }}
387388
permissions:
388389
contents: read
389390
actions: read
@@ -410,7 +411,7 @@ jobs:
410411
platforms: ${{ matrix.platforms }}
411412
image: ${{ matrix.image }}
412413
target: ${{ matrix.target }}
413-
go_md5: ${{ needs.checks.outputs.go_code_md5 }}
414+
go-md5: ${{ needs.checks.outputs.go_code_md5 }}
414415
release-url: ${{ needs.release-notes.outputs.release-url }}
415416
permissions:
416417
contents: read
@@ -433,7 +434,7 @@ jobs:
433434
platforms: ${{ matrix.platforms }}
434435
image: ${{ matrix.image }}
435436
target: ${{ matrix.target }}
436-
go_md5: ${{ needs.checks.outputs.go_code_md5 }}
437+
go-md5: ${{ needs.checks.outputs.go_code_md5 }}
437438
nap_modules: ${{ matrix.nap_modules }}
438439
release-url: ${{ needs.release-notes.outputs.release-url }}
439440
permissions:

‎.github/workflows/dependency-review.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ jobs:
2323
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2424

2525
- name: "Dependency Review"
26-
uses: actions/dependency-review-action@01bc87099ba56df1e897b6874784491ea6309bc4 # v3.1.4
26+
uses: actions/dependency-review-action@c74b580d73376b7750d3d2a50bfb8adc2c937507 # v3.1.5
2727
with:
2828
config-file: "nginxinc/k8s-common/dependency-review-config.yml@main"

‎tests/requirements.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
#
55
# pip-compile --generate-hashes --resolver=backtracking requirements.txt
66
#
7-
attrs==23.1.0 \
8-
--hash=sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04 \
9-
--hash=sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015
7+
attrs==23.2.0 \
8+
--hash=sha256:935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30 \
9+
--hash=sha256:99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1
1010
# via -r requirements.txt
1111
cachetools==5.3.2 \
1212
--hash=sha256:086ee420196f7b2ab9ca2db2520aca326318b68fe5ba8bc4d49cca91add450f2 \
@@ -421,9 +421,9 @@ pyparsing==3.1.1 \
421421
--hash=sha256:32c7c0b711493c72ff18a981d24f28aaf9c1fb7ed5e9667c9e84e3db623bdbfb \
422422
--hash=sha256:ede28a1a32462f5a9705e07aea48001a08f7cf81a021585011deba701581a0db
423423
# via -r requirements.txt
424-
pytest==7.4.3 \
425-
--hash=sha256:0d009c083ea859a71b76adf7c1d502e4bc170b80a8ef002da5806527b9591fac \
426-
--hash=sha256:d989d136982de4e3b29dabcc838ad581c64e8ed52c11fbe86ddebd9da0818cd5
424+
pytest==7.4.4 \
425+
--hash=sha256:2cf0005922c6ace4a3e2ec8b4080eb0d9753fdc93107415332f50ce9e7994280 \
426+
--hash=sha256:b090cdf5ed60bf4c45261be03239c2c1c22df034fbffe691abe93cd80cea01d8
427427
# via
428428
# -r requirements.txt
429429
# pytest-html

0 commit comments

Comments
 (0)
0