Skip to content

Commit dd83f47

Browse files
authored
Merge pull request #296 from sunya-ch/upgrade-go
chore: upgrade controller go to 1.24.1
2 parents 29bd1d7 + eb145c1 commit dd83f47

File tree

11 files changed

+48
-47
lines changed

11 files changed

+48
-47
lines changed

.github/workflows/build_catalog.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Set up Go
2929
uses: actions/setup-go@v3
3030
with:
31-
go-version: '1.22'
31+
go-version: '1.24.1'
3232

3333
- name: Install dependencies
3434
run: |

.github/workflows/build_push_concheck.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@v2
2121
- uses: actions/setup-go@v2
2222
with:
23-
go-version: '1.22.0'
23+
go-version: '1.24.1'
2424
- name: Set up Docker
2525
uses: docker/setup-buildx-action@v1
2626
- name: Login to Docker

.github/workflows/build_push_controller.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- uses: actions/checkout@v2
3131
- uses: actions/setup-go@v2
3232
with:
33-
go-version: '1.22.0'
33+
go-version: '1.24.1'
3434
- name: set ARCH and OD
3535
run: |
3636
echo "ARCH=$(case $(uname -m) in x86_64) echo -n amd64 ;; aarch64) echo -n arm64 ;; *) echo -n $(uname -m) ;; esac)" >> $GITHUB_ENV
@@ -70,7 +70,7 @@ jobs:
7070
- uses: actions/checkout@v2
7171
- uses: actions/setup-go@v2
7272
with:
73-
go-version: '1.22.0'
73+
go-version: '1.24.1'
7474
- name: Tidy
7575
run: |
7676
go mod tidy

.github/workflows/build_push_pr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
repository: ${{github.event.pull_request.head.repo.full_name}}
3939
- uses: actions/setup-go@v2
4040
with:
41-
go-version: '1.22.0'
41+
go-version: '1.24.1'
4242
- name: Tidy
4343
run: |
4444
go mod tidy
@@ -72,7 +72,7 @@ jobs:
7272
repository: ${{github.event.pull_request.head.repo.full_name}}
7373
- uses: actions/setup-go@v2
7474
with:
75-
go-version: '1.22.0'
75+
go-version: '1.24.1'
7676
- name: set ARCH and OD
7777
run: |
7878
echo "ARCH=$(case $(uname -m) in x86_64) echo -n amd64 ;; aarch64) echo -n arm64 ;; *) echo -n $(uname -m) ;; esac)" >> $GITHUB_ENV

.github/workflows/golangci-lint.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55

66
env:
7-
GOLANGCI_LINT_VERSION: v1.54.2
7+
GOLANGCI_LINT_VERSION: v1.64.8
88

99
jobs:
1010
golangci:
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- uses: actions/setup-go@v3
1515
with:
16-
go-version: '1.22.0'
16+
go-version: '1.24.1'
1717
- uses: actions/checkout@v3
1818
- name: Tidy
1919
run: |

.github/workflows/unittest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@v2
2222
- uses: actions/setup-go@v2
2323
with:
24-
go-version: '1.22.0'
24+
go-version: '1.24.1'
2525
- name: set ARCH and OD
2626
run: |
2727
echo "ARCH=$(case $(uname -m) in x86_64) echo -n amd64 ;; aarch64) echo -n arm64 ;; *) echo -n $(uname -m) ;; esac)" >> $GITHUB_ENV

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: Apache2.0
44
#
55
# Build the manager binary
6-
FROM golang:1.22 as builder
6+
FROM golang:1.24 as builder
77

88
WORKDIR /workspace
99
# Copy the Go Modules manifests

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ GOLANGCI_LINT_INSTALL_SCRIPT ?= 'https://raw.githubusercontent.com/golangci/gola
118118
.PHONY: golangci-lint
119119
golangci-lint: $(GOLANGCI_LINT) ### Download golangci-lint locally if necessary.
120120
$(GOLANGCI_LINT):$(DEV_BIN_DIR)
121-
test -s $(GOLANGCI_LINT) || { curl -sSfL $(GOLANGCI_LINT_INSTALL_SCRIPT) | sh -s -- -b $(DEV_BIN_DIR) v1.54.2; }
121+
test -s $(GOLANGCI_LINT) || { curl -sSfL $(GOLANGCI_LINT_INSTALL_SCRIPT) | sh -s -- -b $(DEV_BIN_DIR) v1.64.8; }
122122

123123
.PHONY: manifests
124124
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
@@ -163,7 +163,7 @@ $(TEST_RESULT_DIR):
163163
.PHONY: ginkgo
164164
ginkgo: $(GINKGO) ## Download and install ginkgo locally if necessary.
165165
$(GINKGO): $(TEST_BIN_DIR)
166-
$(call go-get-tool,$(TEST_BIN_DIR),$(GINKGO),github.com/onsi/ginkgo/v2/ginkgo@v2.20.1)
166+
$(call go-get-tool,$(TEST_BIN_DIR),$(GINKGO),github.com/onsi/ginkgo/v2/ginkgo@v2.21.0)
167167

168168
.PHONY: envtest
169169
envtest: $(ENVTEST) ## Download and install setup-envtest locally if necessary.

connection-check/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN apt-get update \
1010
&& rm -rf /var/lib/apt/lists/*
1111

1212
# install go
13-
RUN wget https://golang.org/dl/go1.17.linux-amd64.tar.gz && rm -rf /usr/local/go && tar -C /usr/local -xzf go1.17.linux-amd64.tar.gz
13+
RUN wget https://golang.org/dl/go1.24.1.linux-amd64.tar.gz && rm -rf /usr/local/go && tar -C /usr/local -xzf go1.24.1.linux-amd64.tar.gz
1414
ENV PATH "/usr/local/go/bin:${PATH}"
1515
RUN mkdir -p /usr/local/app
1616
WORKDIR /usr/local/app

go.mod

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
module github.com/foundation-model-stack/multi-nic-cni
22

3-
go 1.22.0
3+
go 1.24.1
44

55
require (
66
github.com/Masterminds/sprig v2.22.0+incompatible
77
github.com/containernetworking/cni v1.0.1
88
github.com/go-logr/logr v1.4.2
9-
github.com/onsi/ginkgo/v2 v2.20.1
9+
github.com/onsi/ginkgo/v2 v2.21.0
1010
github.com/onsi/gomega v1.36.1
1111
github.com/operator-framework/operator-lib v0.11.0
1212
github.com/pkg/errors v0.9.1
13-
go.uber.org/zap v1.26.0
14-
k8s.io/api v0.31.0
15-
k8s.io/apimachinery v0.31.0
16-
k8s.io/client-go v0.31.0
13+
go.uber.org/zap v1.27.0
14+
k8s.io/api v0.32.0
15+
k8s.io/apimachinery v0.32.0
16+
k8s.io/client-go v0.32.0
17+
sigs.k8s.io/controller-runtime v0.20.1
1718
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
18-
sigs.k8s.io/controller-runtime v0.19.1
1919
)
2020

2121
require (
22+
cel.dev/expr v0.18.0 // indirect
2223
github.com/Masterminds/goutils v1.1.1 // indirect
2324
github.com/Masterminds/semver v1.5.0 // indirect
2425
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
@@ -35,18 +36,18 @@ require (
3536
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3637
github.com/go-logr/stdr v1.2.2 // indirect
3738
github.com/go-logr/zapr v1.3.0 // indirect
38-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
39+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3940
github.com/go-openapi/jsonreference v0.20.2 // indirect
40-
github.com/go-openapi/swag v0.22.4 // indirect
41+
github.com/go-openapi/swag v0.23.0 // indirect
4142
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4243
github.com/gogo/protobuf v1.3.2 // indirect
43-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4444
github.com/golang/protobuf v1.5.4 // indirect
45-
github.com/google/cel-go v0.20.1 // indirect
45+
github.com/google/btree v1.1.3 // indirect
46+
github.com/google/cel-go v0.22.0 // indirect
4647
github.com/google/gnostic-models v0.6.8 // indirect
4748
github.com/google/go-cmp v0.6.0 // indirect
4849
github.com/google/gofuzz v1.2.0 // indirect
49-
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect
50+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
5051
github.com/google/uuid v1.6.0 // indirect
5152
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
5253
github.com/huandu/xstrings v1.5.0 // indirect
@@ -66,7 +67,7 @@ require (
6667
github.com/prometheus/procfs v0.15.1 // indirect
6768
github.com/spf13/cobra v1.8.1 // indirect
6869
github.com/spf13/pflag v1.0.5 // indirect
69-
github.com/stoewer/go-strcase v1.2.0 // indirect
70+
github.com/stoewer/go-strcase v1.3.0 // indirect
7071
github.com/x448/float16 v0.8.4 // indirect
7172
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
7273
go.opentelemetry.io/otel v1.28.0 // indirect
@@ -77,32 +78,32 @@ require (
7778
go.opentelemetry.io/otel/trace v1.28.0 // indirect
7879
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
7980
go.uber.org/multierr v1.11.0 // indirect
80-
golang.org/x/crypto v0.30.0 // indirect
81+
golang.org/x/crypto v0.36.0 // indirect
8182
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
82-
golang.org/x/net v0.32.0 // indirect
83-
golang.org/x/oauth2 v0.21.0 // indirect
84-
golang.org/x/sync v0.10.0 // indirect
85-
golang.org/x/sys v0.28.0 // indirect
86-
golang.org/x/term v0.27.0 // indirect
87-
golang.org/x/text v0.21.0 // indirect
88-
golang.org/x/time v0.3.0 // indirect
89-
golang.org/x/tools v0.28.0 // indirect
83+
golang.org/x/net v0.38.0 // indirect
84+
golang.org/x/oauth2 v0.23.0 // indirect
85+
golang.org/x/sync v0.12.0 // indirect
86+
golang.org/x/sys v0.31.0 // indirect
87+
golang.org/x/term v0.30.0 // indirect
88+
golang.org/x/text v0.23.0 // indirect
89+
golang.org/x/time v0.7.0 // indirect
90+
golang.org/x/tools v0.26.0 // indirect
9091
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
91-
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
92-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
92+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
93+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
9394
google.golang.org/grpc v1.65.0 // indirect
9495
google.golang.org/protobuf v1.35.1 // indirect
96+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9597
gopkg.in/inf.v0 v0.9.1 // indirect
96-
gopkg.in/yaml.v2 v2.4.0 // indirect
9798
gopkg.in/yaml.v3 v3.0.1 // indirect
98-
k8s.io/apiextensions-apiserver v0.31.0 // indirect
99-
k8s.io/apiserver v0.31.0 // indirect
100-
k8s.io/component-base v0.31.0 // indirect
99+
k8s.io/apiextensions-apiserver v0.32.0 // indirect
100+
k8s.io/apiserver v0.32.0 // indirect
101+
k8s.io/component-base v0.32.0 // indirect
101102
k8s.io/klog/v2 v2.130.1 // indirect
102-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
103-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
104-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
105-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
103+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
104+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
105+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
106+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
106107
sigs.k8s.io/yaml v1.4.0 // indirect
107108
)
108109

0 commit comments

Comments
 (0)