Skip to content

Commit 8278001

Browse files
authored
Merge branch 'main' into feat/conntrack
2 parents ec8af2a + 30a128b commit 8278001

File tree

6 files changed

+31
-36
lines changed

6 files changed

+31
-36
lines changed

.github/workflows/codeql.yaml

+4-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
goos: [linux, windows]
1616
goarch: [amd64, arm64]
1717
language: [go]
18-
go-version: ["1.21"]
1918
runs-on: ubuntu-latest
2019
env:
2120
IS_NOT_MERGE_GROUP: ${{ github.event_name != 'merge_group' }}
@@ -27,14 +26,14 @@ jobs:
2726
contents: read
2827
security-events: write
2928
steps:
29+
- name: Checkout repository
30+
if: env.IS_NOT_MERGE_GROUP
31+
uses: actions/checkout@v4
3032
- name: Setup go
3133
if: env.IS_NOT_MERGE_GROUP
3234
uses: actions/setup-go@v5
3335
with:
34-
go-version: ${{ matrix.go-version }}
35-
- name: Checkout repository
36-
if: env.IS_NOT_MERGE_GROUP
37-
uses: actions/checkout@v4
36+
go-version-file: go.mod
3837
- name: Initialize CodeQL
3938
if: env.IS_NOT_MERGE_GROUP
4039
uses: github/codeql-action/init@v3

.github/workflows/golangci-lint.yaml

+4-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
go-version: ["1.21.x"]
1514
goos: ["linux", "windows"]
1615
goarch: ["amd64", "arm64"]
1716
name: Lint
@@ -21,14 +20,14 @@ jobs:
2120
GOOS: ${{ matrix.goos }}
2221
GOARCH: ${{ matrix.goarch }}
2322
steps:
24-
- uses: actions/setup-go@v5
25-
if: env.IS_NOT_MERGE_GROUP
26-
with:
27-
go-version: ${{ matrix.go-version }}
2823
- uses: actions/checkout@v4
2924
if: env.IS_NOT_MERGE_GROUP
3025
with:
3126
fetch-depth: 0
27+
- uses: actions/setup-go@v5
28+
if: env.IS_NOT_MERGE_GROUP
29+
with:
30+
go-version-file: go.mod
3231
- name: golangci-lint
3332
if: env.IS_NOT_MERGE_GROUP
3433
uses: golangci/golangci-lint-action@v4

.github/workflows/goreleaser.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Go
2121
uses: actions/setup-go@v4
2222
with:
23-
go-version: ">=1.21.0"
23+
go-version-file: go.mod
2424
- name: Run GoReleaser build
2525
uses: goreleaser/goreleaser-action@v5
2626
with:
@@ -39,7 +39,7 @@ jobs:
3939
- name: Set up Go
4040
uses: actions/setup-go@v4
4141
with:
42-
go-version: ">=1.21.0"
42+
go-version-file: go.mod
4343
- name: Run GoReleaser release
4444
uses: goreleaser/goreleaser-action@v5
4545
with:

.github/workflows/images.yaml

+11-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build images and run E2E tests.
1+
name: Build images and run E2E tests.
22

33
on:
44
pull_request:
@@ -26,7 +26,7 @@ jobs:
2626

2727
- uses: actions/setup-go@v4
2828
with:
29-
go-version: ">=1.21.0"
29+
go-version-file: go.mod
3030
- run: go version
3131

3232
- name: Set up QEMU
@@ -58,7 +58,6 @@ jobs:
5858
env:
5959
IS_MERGE_GROUP: ${{ github.event_name == 'merge_group' }}
6060

61-
6261
retina-win-images:
6362
name: Build Agent Windows Images
6463
runs-on: ubuntu-latest
@@ -74,18 +73,18 @@ jobs:
7473

7574
- uses: actions/setup-go@v4
7675
with:
77-
go-version: ">=1.21.0"
76+
go-version-file: go.mod
7877
- run: go version
7978

8079
- name: Set up QEMU
8180
uses: docker/setup-qemu-action@v3
82-
81+
8382
- name: Az CLI login
8483
uses: azure/login@v1
8584
if: ${{ github.event_name == 'merge_group' }}
8685
with:
8786
creds: ${{ secrets.AZURE_CREDENTIALS }}
88-
87+
8988
- name: Build Images
9089
shell: bash
9190
run: |
@@ -121,7 +120,7 @@ jobs:
121120

122121
- uses: actions/setup-go@v4
123122
with:
124-
go-version: ">=1.21.0"
123+
go-version-file: go.mod
125124
- run: go version
126125

127126
- name: Set up QEMU
@@ -132,7 +131,7 @@ jobs:
132131
if: ${{ github.event_name == 'merge_group' }}
133132
with:
134133
creds: ${{ secrets.AZURE_CREDENTIALS }}
135-
134+
136135
- name: Build Images
137136
shell: bash
138137
run: |
@@ -169,7 +168,7 @@ jobs:
169168

170169
- name: Setup QEMU
171170
uses: docker/setup-qemu-action@v3
172-
171+
173172
- name: Azure CLI login
174173
uses: azure/login@v1
175174
with:
@@ -182,7 +181,7 @@ jobs:
182181
az acr login -n ${{ vars.ACR_NAME }}
183182
make manifest COMPONENT=${{ matrix.components }} \
184183
IMAGE_REGISTRY=${{ vars.ACR_NAME }} \
185-
184+
186185
e2e:
187186
if: ${{ github.event_name == 'merge_group' }}
188187
name: Run E2E Tests
@@ -200,7 +199,7 @@ jobs:
200199
- name: Setup go
201200
uses: actions/setup-go@v4
202201
with:
203-
go-version: ">=1.21.0"
202+
go-version-file: go.mod
204203
- run: go version
205204

206205
- name: Az CLI login
@@ -214,4 +213,4 @@ jobs:
214213
run: |
215214
set -euo pipefail
216215
export AZURE_SUBSCRIPTION_ID=${{ secrets.AZURE_SUBSCRIPTION }}
217-
go test -v ./test/e2e/scenarios/retina/*.go -timeout 30m -tags=e2e -count=1 -args -image-tag=$(make version) -image-registry=${{ vars.ACR_NAME }} -image-namespace=${{ github.repository}}
216+
go test -v ./test/e2e/scenarios/retina/*.go -timeout 30m -tags=e2e -count=1 -args -image-tag=$(make version) -image-registry=${{ vars.ACR_NAME }} -image-namespace=${{ github.repository}}

.github/workflows/release-images.yaml

+9-11
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828

2929
- uses: actions/setup-go@v4
3030
with:
31-
go-version: ">=1.21.0"
31+
go-version-file: go.mod
3232
- run: go version
33-
33+
3434
- name: Install Cosign
3535
uses: sigstore/[email protected]
3636

@@ -49,7 +49,7 @@ jobs:
4949
IMAGE_NAMESPACE=${{ github.repository }} \
5050
PLATFORM=${{ matrix.platform }}/${{ matrix.arch }} \
5151
BUILDX_ACTION=--push
52-
52+
5353
- name: Sign container image
5454
run: |
5555
for image in retina-agent retina-init; do
@@ -58,7 +58,6 @@ jobs:
5858
cosign sign --yes ${IMAGE_PATH}@${DIGEST}
5959
done
6060
61-
6261
retina-win-images:
6362
name: Build Agent Windows Images
6463
runs-on: ubuntu-latest
@@ -74,12 +73,12 @@ jobs:
7473

7574
- uses: actions/setup-go@v4
7675
with:
77-
go-version: ">=1.21.0"
76+
go-version-file: go.mod
7877
- run: go version
7978

8079
- name: Install Cosign
8180
uses: sigstore/[email protected]
82-
81+
8382
- name: Set up QEMU
8483
uses: docker/setup-qemu-action@v3
8584

@@ -121,9 +120,9 @@ jobs:
121120

122121
- uses: actions/setup-go@v4
123122
with:
124-
go-version: ">=1.21.0"
123+
go-version-file: go.mod
125124
- run: go version
126-
125+
127126
- name: Install Cosign
128127
uses: sigstore/[email protected]
129128

@@ -142,7 +141,7 @@ jobs:
142141
IMAGE_NAMESPACE=${{ github.repository }} \
143142
PLATFORM=${{ matrix.platform }}/${{ matrix.arch }} \
144143
BUILDX_ACTION=--push
145-
144+
146145
- name: Sign container image
147146
run: |
148147
for image in retina-operator ; do
@@ -151,7 +150,6 @@ jobs:
151150
cosign sign --yes ${IMAGE_PATH}@${DIGEST}
152151
done
153152
154-
155153
manifests:
156154
name: Generate Manifests
157155
runs-on: ubuntu-latest
@@ -167,7 +165,7 @@ jobs:
167165

168166
- name: Set up QEMU
169167
uses: docker/setup-qemu-action@v3
170-
168+
171169
- name: Install Cosign
172170
uses: sigstore/[email protected]
173171

.github/workflows/test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
- uses: actions/setup-go@v5
2626
with:
27-
go-version: "^1.21"
27+
go-version-file: go.mod
2828

2929
- name: Make Retina Test image
3030
env:

0 commit comments

Comments
 (0)