Skip to content

Commit 70faa36

Browse files
committed
Upgrade Go and library version
1 parent 547e64e commit 70faa36

File tree

4 files changed

+23
-31
lines changed

4 files changed

+23
-31
lines changed

.devcontainer/devcontainer.json

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,16 @@
55
"image": "mcr.microsoft.com/devcontainers/base:bullseye",
66
"features": {
77
"ghcr.io/devcontainers/features/go:1": {
8-
"version": "1.22"
8+
"version": "1.24"
99
},
1010
"ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {
1111
"version": "latest",
1212
"helm": "latest",
1313
"minikube": "none"
1414
},
15-
"ghcr.io/devcontainers-contrib/features/kops:1": {
16-
"version": "latest"
17-
},
1815
"ghcr.io/stuartleeks/dev-container-features/shell-history:0": {},
19-
"ghcr.io/rio/features/k3d:1": {},
2016
"ghcr.io/mpriscella/features/sops:1": {},
2117
"ghcr.io/mpriscella/features/kind:1": {},
22-
"ghcr.io/balazs23/devcontainers-features/bazel:1": {},
23-
"ghcr.io/rio/features/skaffold:2": {},
2418
"ghcr.io/rio/features/kustomize:1": {},
2519
"ghcr.io/audacioustux/devcontainers/kubebuilder:1": {},
2620

@@ -51,8 +45,8 @@
5145
"type=volume,source=aws-cred,target=/root/.aws,consistency=delegated",
5246
"type=volume,source=k8s-cred,target=/root/.kube,consistency=delegated",
5347

54-
"type=volume,source=go-sdk-1-22,target=/usr/local/go,consistency=delegated",
55-
"type=volume,source=go-path-bin-1-22,target=/go/bin,consistency=delegated",
48+
"type=volume,source=go-sdk-1-24,target=/usr/local/go,consistency=delegated",
49+
"type=volume,source=go-path-bin-1-24,target=/go/bin,consistency=delegated",
5650
"type=volume,source=go-path,target=/go/pkg,consistency=delegated",
5751
"type=volume,source=go-cache,target=/tmp/gocache,consistency=delegated",
5852
"type=volume,source=jetbrains,target=/root/.cache/JetBrains,consistency=delegated"

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.22 AS builder
2+
FROM golang:1.24 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55
ARG GITVERSION

go.mod

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/norseto/oci-lb-controller
22

3-
go 1.22.0
4-
5-
toolchain go1.22.12
3+
go 1.24
64

75
require (
86
github.com/onsi/ginkgo/v2 v2.19.0
@@ -74,12 +72,12 @@ require (
7472
go.uber.org/multierr v1.11.0 // indirect
7573
go.uber.org/zap v1.26.0 // indirect
7674
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
77-
golang.org/x/net v0.33.0 // indirect
78-
golang.org/x/oauth2 v0.21.0 // indirect
79-
golang.org/x/sync v0.10.0 // indirect
80-
golang.org/x/sys v0.28.0 // indirect
81-
golang.org/x/term v0.27.0 // indirect
82-
golang.org/x/text v0.21.0 // indirect
75+
golang.org/x/net v0.39.0 // indirect
76+
golang.org/x/oauth2 v0.29.0 // indirect
77+
golang.org/x/sync v0.13.0 // indirect
78+
golang.org/x/sys v0.32.0 // indirect
79+
golang.org/x/term v0.31.0 // indirect
80+
golang.org/x/text v0.24.0 // indirect
8381
golang.org/x/time v0.3.0 // indirect
8482
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
8583
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect

go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -173,27 +173,27 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
173173
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
174174
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
175175
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
176-
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
177-
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
178-
golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
179-
golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
176+
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
177+
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
178+
golang.org/x/oauth2 v0.29.0 h1:WdYw2tdTK1S8olAzWHdgeqfy+Mtm9XNhv/xJsY65d98=
179+
golang.org/x/oauth2 v0.29.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
180180
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
181181
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
182182
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
183-
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
184-
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
183+
golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
184+
golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
185185
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
186186
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
187187
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
188188
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
189-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
190-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
191-
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
192-
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
189+
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
190+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
191+
golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
192+
golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
193193
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
194194
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
195-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
196-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
195+
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
196+
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
197197
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
198198
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
199199
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

0 commit comments

Comments
 (0)