Skip to content

Commit d4206e2

Browse files
committed
Merge branch 'main' into gke-network-policy
2 parents 6d86811 + 9b2772a commit d4206e2

File tree

13 files changed

+231
-149
lines changed

13 files changed

+231
-149
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222

2323
jobs:
2424
analyze:
25-
timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
25+
timeout-minutes: 10
2626
runs-on: ubuntu-latest
2727
permissions:
2828
actions: read
@@ -39,16 +39,16 @@ jobs:
3939

4040
steps:
4141
- name: Checkout repository
42-
uses: actions/checkout@v4
42+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4343

4444
- name: Setup Go
45-
uses: actions/setup-go@v5
45+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
4646
with:
4747
go-version-file: go.mod
4848

4949
# Initializes the CodeQL tools for scanning.
5050
- name: Initialize CodeQL
51-
uses: github/codeql-action/init@v3
51+
uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
5252
with:
5353
languages: ${{ matrix.language }}
5454
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -59,7 +59,7 @@ jobs:
5959
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
6060
# If this step fails, then you should remove it and run the build manually (see below)
6161
- name: Autobuild
62-
uses: github/codeql-action/autobuild@v3
62+
uses: github/codeql-action/autobuild@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
6363

6464
# ℹ️ Command-line programs to run using the OS shell.
6565
# 📚 https://git.io/JvXDl
@@ -73,4 +73,4 @@ jobs:
7373
# make release
7474

7575
- name: Perform CodeQL Analysis
76-
uses: github/codeql-action/analyze@v3
76+
uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3

.github/workflows/lint.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ on:
1313

1414
jobs:
1515
golangci-lint:
16-
timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
16+
timeout-minutes: 10
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: checkout repository
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2121
with:
2222
fetch-depth: 0
2323

2424
- name: setup golang
25-
uses: actions/setup-go@v5
25+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
2626
with:
2727
go-version-file: go.mod
2828

2929
- name: Run golangci-lint
30-
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
30+
uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0
3131
with:
3232
skip-cache: true # actions/setup-go from v4 handles caching for us

.github/workflows/release-testing.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,31 @@ jobs:
1414
# --------------------------------------------------------------------------
1515

1616
unit-tests:
17-
timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
17+
timeout-minutes: 10
1818
runs-on: ubuntu-latest
1919
steps:
2020

2121
- name: checkout repository
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323
with:
2424
fetch-depth: 0
2525

2626
- name: setup golang
27-
uses: actions/setup-go@v5
27+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
2828
with:
2929
go-version-file: go.mod
3030

3131
- name: run unit tests
3232
run: make test.unit
3333

3434
setup-integration-tests:
35-
timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
35+
timeout-minutes: 10
3636
runs-on: ubuntu-latest
3737
outputs:
3838
test_names: ${{ steps.set_test_names.outputs.test_names }}
3939
steps:
4040

41-
- uses: actions/checkout@v4
41+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4242

4343
- id: set_test_names
4444
name: Set test names
@@ -67,12 +67,12 @@ jobs:
6767
op-token: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
6868

6969
- name: checkout repository
70-
uses: actions/checkout@v4
70+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7171
with:
7272
fetch-depth: 0
7373

7474
- name: setup golang
75-
uses: actions/setup-go@v5
75+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
7676
with:
7777
go-version-file: go.mod
7878

@@ -101,12 +101,12 @@ jobs:
101101
# --------------------------------------------------------------------------
102102

103103
- name: checkout repository
104-
uses: actions/checkout@v4
104+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
105105
with:
106106
fetch-depth: 0
107107

108108
- name: setup golang
109-
uses: actions/setup-go@v5
109+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
110110
with:
111111
go-version-file: go.mod
112112

@@ -120,7 +120,7 @@ jobs:
120120
KONG_LICENSE_DATA: ${{ steps.license.outputs.license }}
121121

122122
release-tagging:
123-
timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
123+
timeout-minutes: 10
124124
runs-on: ubuntu-latest
125125
needs:
126126
- unit-tests
@@ -129,7 +129,7 @@ jobs:
129129
steps:
130130

131131
- name: checkout repository
132-
uses: actions/checkout@v4
132+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
133133
with:
134134
fetch-depth: 0
135135
# This is needed to trigger another workflow, specifically release workflow

.github/workflows/release.yaml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010

1111
artifacts:
12-
timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
12+
timeout-minutes: 10
1313
runs-on: ubuntu-latest
1414
strategy:
1515
fail-fast: false
@@ -30,12 +30,12 @@ jobs:
3030
# --------------------------------------------------------------------------
3131

3232
- name: checkout repository
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3434
with:
3535
fetch-depth: 0
3636

3737
- name: setup golang
38-
uses: actions/setup-go@v5
38+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
3939
with:
4040
go-version-file: go.mod
4141

@@ -46,9 +46,9 @@ jobs:
4646
- name: build for ${{ matrix.os }} ${{ matrix.arch }}
4747
run: make build GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }}
4848
- name: upload ${{ matrix.os }} ${{ matrix.arch }} artifact
49-
uses: actions/upload-artifact@v3
49+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
5050
with:
51-
name: bin
51+
name: bin-${{ matrix.os }}-${{ matrix.arch }}
5252
path: build/ktf.${{ matrix.os }}.${{ matrix.arch }}
5353
if-no-files-found: error
5454

@@ -60,9 +60,9 @@ jobs:
6060
run: sha256sum ktf.${{ matrix.os }}.${{ matrix.arch }} >> CHECKSUMS.${{ matrix.os }}.${{ matrix.arch }}
6161
working-directory: ./build/
6262
- name: upload checksum for ${{ matrix.os }} ${{ matrix.arch }}
63-
uses: actions/upload-artifact@v3
63+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
6464
with:
65-
name: CHECKSUMS
65+
name: CHECKSUMS-${{ matrix.os }}-${{ matrix.arch }}
6666
path: build/CHECKSUMS.${{ matrix.os }}.${{ matrix.arch }}
6767
if-no-files-found: error
6868

@@ -71,7 +71,7 @@ jobs:
7171
# --------------------------------------------------------------------------
7272

7373
release:
74-
timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
74+
timeout-minutes: 10
7575
runs-on: ubuntu-latest
7676
needs:
7777
- artifacts
@@ -82,17 +82,19 @@ jobs:
8282
# --------------------------------------------------------------------------
8383

8484
- name: download checksums artifact
85-
uses: actions/download-artifact@v3
85+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
8686
with:
87-
name: CHECKSUMS
87+
pattern: CHECKSUMS*
88+
merge-multiple: true
8889

8990
- name: concatenate all checksums
9091
run: cat CHECKSUMS.* > CHECKSUMS
9192

9293
- name: download binary artifacts
93-
uses: actions/download-artifact@v3
94+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
9495
with:
95-
name: bin
96+
pattern: bin*
97+
merge-multiple: true
9698

9799
- name: Release
98100
uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2.2.1

0 commit comments

Comments
 (0)