Skip to content

Commit d2b3e42

Browse files
jpayne3506rbtr
andauthored
chore: update to go1.24 (#3912)
* chore: update to go1.24 Signed-off-by: Evan Baker <[email protected]> * chore: cleanup rebase * chore: regenerate crds * chore: address comments * chore: clean up go tool cover * chore: pre-review cleanup * revert: ipv6 image from azurelinux to base * chore: add back go-junit-report tool install * chore: clean up cni non-constant Errorf usage * chore: clean up cns non-constant Sprintf usage * chore: clean up npm non-constant Sprintf usage * chore: clean up test non-constant Errorf usage * chore: cleanup windows NPM * chore: generate bpf-lib(s) for block-iptables in signed UTs * chore: cleanup rebase --------- Signed-off-by: Evan Baker <[email protected]> Co-authored-by: Evan Baker <[email protected]>
1 parent cfe6f49 commit d2b3e42

File tree

73 files changed

+1398
-1522
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1398
-1522
lines changed

.devcontainer/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG VARIANT="1.23"
1+
ARG VARIANT="1.24"
22
FROM mcr.microsoft.com/vscode/devcontainers/go:${VARIANT}
33
RUN apt-get update && \
44
export DEBIAN_FRONTEND=noninteractive && \
@@ -8,4 +8,6 @@ RUN apt-get update && \
88
skopeo \
99
vim \
1010
fzf \
11-
ripgrep
11+
ripgrep \
12+
jq \
13+
curl

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"build": {
66
"dockerfile": "Dockerfile",
77
"args": {
8-
"VARIANT": "1.23-bullseye",
8+
"VARIANT": "1.24",
99
"NODE_VERSION": "none"
1010
}
1111
},

.github/dependabot.yaml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -62,27 +62,6 @@ updates:
6262
versions: [">=0.35.0"]
6363
- dependency-name: "k8s.io/kubectl"
6464
versions: [">=0.35.0"]
65-
- package-ecosystem: "gomod"
66-
directory: "/build/tools"
67-
schedule:
68-
interval: "daily"
69-
commit-message:
70-
prefix: "deps"
71-
labels: [ "dependencies" ]
72-
open-pull-requests-limit: 10
73-
ignore:
74-
- dependency-name: "k8s.io/api"
75-
versions: [">=0.35.0"]
76-
- dependency-name: "k8s.io/apiextensions-apiserver"
77-
versions: [">=0.35.0"]
78-
- dependency-name: "k8s.io/apimachinery"
79-
versions: [">=0.35.0"]
80-
- dependency-name: "k8s.io/client-go"
81-
versions: [">=0.35.0"]
82-
- dependency-name: "k8s.io/kubelet"
83-
versions: [">=0.35.0"]
84-
- dependency-name: "k8s.io/kubectl"
85-
versions: [">=0.35.0"]
8665
- package-ecosystem: "gomod"
8766
directory: "/dropgz"
8867
schedule:

.github/workflows/baseimages.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ jobs:
1818
- uses: actions/checkout@v4
1919
with:
2020
fetch-depth: 0
21-
- name: Set up Go
22-
uses: actions/setup-go@v5
21+
- uses: actions/setup-go@v5
2322
with:
24-
go-version: '1.23'
23+
go-version-file: go.mod
24+
- name: go env
25+
run: |
26+
echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
2527
- name: Render Dockerfiles
2628
run: make dockerfiles
2729
- name: Fail if base images are outdated

.github/workflows/codeql.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,12 @@ jobs:
3232
contents: read
3333
security-events: write
3434
steps:
35+
- name: Checkout repository
36+
uses: actions/checkout@v4
3537
- name: Setup go
3638
uses: actions/setup-go@v5
3739
with:
38-
go-version: "1.23"
39-
check-latest: true
40-
- name: Checkout repository
41-
uses: actions/checkout@v4
40+
go-version-file: go.mod
4241
- name: Initialize CodeQL
4342
uses: github/codeql-action/init@v3
4443
with:

.github/workflows/crdgen.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,15 @@ on:
1212
- checks_requested
1313
jobs:
1414
crdgen:
15-
strategy:
16-
matrix:
17-
go-version: ['1.22', '1.23']
18-
os: [ubuntu-latest]
1915
name: CRDs are Generated
20-
runs-on: ${{ matrix.os }}
16+
runs-on: ubuntu-latest
2117
steps:
2218
- uses: actions/checkout@v4
2319
with:
2420
fetch-depth: 0
2521
- uses: actions/setup-go@v5
2622
with:
27-
go-version: ${{ matrix.go-version }}
23+
go-version-file: go.mod
2824
- name: Regenerate NodeNetworkConfig CRD
2925
run: make -C crd/nodenetworkconfig
3026
- name: Regenerate MultitenantNetworkContainer CRD
@@ -36,4 +32,8 @@ jobs:
3632
- name: Regenerate OverlayExtensionConfig CRD
3733
run: make -C crd/overlayextensionconfig
3834
- name: Fail if the tree is dirty
39-
run: test -z "$(git status --porcelain)"
35+
run: |
36+
if [ -n "$(git status --porcelain)" ]; then
37+
echo "Changes detected. Please run 'make regenerate-crd' locally to regenerate crds."
38+
exit 1
39+
fi

.github/workflows/cyclonus-netpol-extended-nightly-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
- uses: actions/setup-go@v5
2828
with:
29-
go-version: "^1.23"
29+
go-version-file: go.mod
3030

3131
- name: Setup Kind
3232
uses: helm/kind-action@v1

.github/workflows/cyclonus-netpol-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
- uses: actions/setup-go@v5
3535
with:
36-
go-version: '^1.23'
36+
go-version-file: go.mod
3737

3838
- name: Setup Kind
3939
uses: helm/kind-action@v1

.github/workflows/golangci.yaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,17 @@ jobs:
3434
strategy:
3535
fail-fast: false
3636
matrix:
37-
go-version: ['1.22.x', '1.23.x']
3837
os: [ubuntu-latest, windows-latest]
3938
name: Lint
4039
needs: generate
4140
runs-on: ${{ matrix.os }}
4241
steps:
43-
- uses: actions/setup-go@v5
44-
with:
45-
go-version: ${{ matrix.go-version }}
4642
- uses: actions/checkout@v4
4743
with:
4844
fetch-depth: 0
45+
- uses: actions/setup-go@v5
46+
with:
47+
go-version-file: go.mod
4948
- name: Download generated code
5049
uses: actions/download-artifact@v4
5150
with:
@@ -54,5 +53,5 @@ jobs:
5453
- name: golangci-lint
5554
uses: golangci/golangci-lint-action@v6
5655
with:
57-
version: v1.61
58-
args: ${{ github.event_name == 'pull_request' && format('--new-from-rev=origin/{0}', github.base_ref) || '' }} --config=.golangci.yml --timeout=25m
56+
version: latest
57+
args: ${{ github.event_name == 'pull_request' && format('--new-from-rev=origin/{0}', github.base_ref) || '' }} --config=.golangci.yml --timeout=25m

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ ipam-*.xml
2525
*.test
2626

2727
controller-gen
28-
build/tools/bin
2928
npm/debug/http
3029

3130
go.work*

0 commit comments

Comments
 (0)