Skip to content

Commit cb2e8aa

Browse files
authored
chore: build with golang 1.24 (#89)
and bump golang.org/x/net as of CVE findings in previous versions Signed-off-by: Mario Constanti <[email protected]>
1 parent 77de225 commit cb2e8aa

File tree

7 files changed

+19
-21
lines changed

7 files changed

+19
-21
lines changed

.github/workflows/build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
- uses: actions/setup-go@v5
2323
with:
24-
go-version: '1.23.0'
24+
go-version: '1.24.2'
2525

2626
- name: make build
2727
run: make build

.github/workflows/foss.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
name: foss-scan
1515
runs-on: ubuntu-latest
1616
steps:
17-
- name: Set up Go 1.23.0
17+
- name: Set up Go 1.24.2
1818
uses: actions/setup-go@v5
1919
with:
20-
go-version: '1.23.0'
20+
go-version: '1.24.2'
2121
id: go
2222

2323
- name: Checkout code

.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- run: git fetch --force --tags
2323
- uses: actions/setup-go@v5
2424
with:
25-
go-version: '1.23.0'
25+
go-version: '1.24.2'
2626

2727
# - name: Synopsys Detect
2828
# run: |

go.mod

+5-7
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
module github.com/mercedes-benz/garm-provider-k8s
44

5-
go 1.23.0
6-
7-
toolchain go1.24.1
5+
go 1.24.2
86

97
require (
108
github.com/cloudbase/garm-provider-common v0.1.3
@@ -48,11 +46,11 @@ require (
4846
github.com/pkg/errors v0.9.1 // indirect
4947
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
5048
github.com/spf13/pflag v1.0.5 // indirect
51-
golang.org/x/net v0.36.0 // indirect
49+
golang.org/x/net v0.39.0 // indirect
5250
golang.org/x/oauth2 v0.12.0 // indirect
53-
golang.org/x/sys v0.30.0 // indirect
54-
golang.org/x/term v0.29.0 // indirect
55-
golang.org/x/text v0.22.0 // indirect
51+
golang.org/x/sys v0.32.0 // indirect
52+
golang.org/x/term v0.31.0 // indirect
53+
golang.org/x/text v0.24.0 // indirect
5654
golang.org/x/time v0.3.0 // indirect
5755
google.golang.org/appengine v1.6.7 // indirect
5856
google.golang.org/protobuf v1.33.0 // indirect

go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR
113113
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
114114
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
115115
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
116-
golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
117-
golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
116+
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
117+
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
118118
golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4=
119119
golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=
120120
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -124,15 +124,15 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
124124
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
125125
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
126126
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
127-
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
128-
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
129-
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
130-
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
127+
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
128+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
129+
golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
130+
golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
131131
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
132132
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
133133
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
134-
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
135-
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
134+
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
135+
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
136136
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
137137
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
138138
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

hack/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: MIT
22

3-
FROM golang:1.23.0 AS build
3+
FROM golang:1.24.2 AS build
44

55
ARG garm_repo=https://github.com/cloudbase/garm
66
ARG garm_repo_ref=v0.1.4

hack/Dockerfile.debug

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: MIT
22

3-
FROM golang:1.23.0-alpine AS build
3+
FROM golang:1.24.2-alpine AS build
44

55
ARG garm_repo=https://github.com/cloudbase/garm
66
ARG garm_repo_ref=main

0 commit comments

Comments
 (0)