Skip to content

Commit 6e41b20

Browse files
authored
update to go-1.24 and alpine-3.21 (#114)
* update to go-1.24 and alpine-3.21 * Fix
1 parent 4d0f260 commit 6e41b20

File tree

5 files changed

+109
-89
lines changed

5 files changed

+109
-89
lines changed

.github/workflows/docker.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
- name: Checkout
2626
uses: actions/checkout@v4
2727

28-
- name: Set up Go 1.23
28+
- name: Set up Go 1.24
2929
uses: actions/setup-go@v5
3030
with:
31-
go-version: "1.23.x"
31+
go-version: "1.24.x"
3232

3333
- name: Lint
3434
uses: golangci/golangci-lint-action@v6
@@ -46,10 +46,10 @@ jobs:
4646
- name: load modules for dm-raid and dm-integrity
4747
run: lsmod && sudo modprobe dm-raid && sudo modprobe dm-integrity && lsmod
4848

49-
- name: Set up Go 1.23
49+
- name: Set up Go 1.24
5050
uses: actions/setup-go@v5
5151
with:
52-
go-version: "1.23.x"
52+
go-version: "1.24.x"
5353

5454
- name: Create k8s Kind Cluster
5555
uses: helm/[email protected]
@@ -84,11 +84,11 @@ jobs:
8484
if: ${{ env.DOCKER_REGISTRY_TOKEN != '' }}
8585
uses: actions/checkout@v4
8686

87-
- name: Set up Go 1.23
87+
- name: Set up Go 1.24
8888
if: ${{ env.DOCKER_REGISTRY_TOKEN != '' }}
8989
uses: actions/setup-go@v5
9090
with:
91-
go-version: "1.23.x"
91+
go-version: "1.24.x"
9292

9393
- name: Set up Docker Buildx
9494
if: ${{ env.DOCKER_REGISTRY_TOKEN != '' }}

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM golang:1.23-alpine AS builder
1+
FROM golang:1.24-alpine AS builder
22
RUN apk add make binutils git
33
COPY / /work
44
WORKDIR /work
55
RUN make lvmplugin
66

7-
FROM alpine:3.20
7+
FROM alpine:3.21
88
LABEL maintainers="Metal Authors"
99
LABEL description="LVM Driver"
1010

cmd/provisioner/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM golang:1.23-alpine AS builder
1+
FROM golang:1.24-alpine AS builder
22
RUN apk add make binutils
33
COPY / /work
44
WORKDIR /work
55
RUN make provisioner
66

7-
FROM alpine:3.20
7+
FROM alpine:3.21
88
LABEL maintainers="Metal Authors"
99
LABEL description="LVM Driver"
1010

go.mod

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,59 @@
11
module github.com/metal-stack/csi-driver-lvm
22

3-
go 1.23
3+
go 1.24
44

55
require (
66
github.com/container-storage-interface/spec v1.9.0
77
github.com/docker/go-units v0.5.0
88
github.com/kubernetes-csi/csi-lib-utils v0.19.0
9-
github.com/urfave/cli/v2 v2.27.4
10-
golang.org/x/net v0.28.0
11-
golang.org/x/sys v0.25.0
12-
google.golang.org/grpc v1.66.0
13-
k8s.io/api v0.31.0
14-
k8s.io/apimachinery v0.31.0
15-
k8s.io/client-go v0.31.0
9+
github.com/urfave/cli/v2 v2.27.6
10+
golang.org/x/net v0.37.0
11+
golang.org/x/sys v0.31.0
12+
google.golang.org/grpc v1.71.0
13+
k8s.io/api v0.32.0
14+
k8s.io/apimachinery v0.32.0
15+
k8s.io/client-go v0.32.0
1616
k8s.io/klog/v2 v2.130.1
1717
)
1818

1919
require (
20-
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
20+
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
2121
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
22-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
22+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
2323
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
2424
github.com/go-logr/logr v1.4.2 // indirect
2525
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2626
github.com/go-openapi/jsonreference v0.21.0 // indirect
2727
github.com/go-openapi/swag v0.23.0 // indirect
2828
github.com/gogo/protobuf v1.3.2 // indirect
2929
github.com/golang/protobuf v1.5.4 // indirect
30-
github.com/google/gnostic-models v0.6.8 // indirect
31-
github.com/google/go-cmp v0.6.0 // indirect
30+
github.com/google/gnostic-models v0.6.9 // indirect
31+
github.com/google/go-cmp v0.7.0 // indirect
3232
github.com/google/gofuzz v1.2.0 // indirect
3333
github.com/google/uuid v1.6.0 // indirect
3434
github.com/josharian/intern v1.0.0 // indirect
3535
github.com/json-iterator/go v1.1.12 // indirect
36-
github.com/mailru/easyjson v0.7.7 // indirect
36+
github.com/mailru/easyjson v0.9.0 // indirect
3737
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3838
github.com/modern-go/reflect2 v1.0.2 // indirect
3939
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
40+
github.com/pkg/errors v0.9.1 // indirect
4041
github.com/russross/blackfriday/v2 v2.1.0 // indirect
4142
github.com/x448/float16 v0.8.4 // indirect
4243
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
43-
golang.org/x/oauth2 v0.23.0 // indirect
44-
golang.org/x/term v0.24.0 // indirect
45-
golang.org/x/text v0.18.0 // indirect
46-
golang.org/x/time v0.6.0 // indirect
47-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
48-
google.golang.org/protobuf v1.34.2 // indirect
44+
golang.org/x/oauth2 v0.28.0 // indirect
45+
golang.org/x/term v0.30.0 // indirect
46+
golang.org/x/text v0.23.0 // indirect
47+
golang.org/x/time v0.11.0 // indirect
48+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
49+
google.golang.org/protobuf v1.36.5 // indirect
50+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
4951
gopkg.in/inf.v0 v0.9.1 // indirect
50-
gopkg.in/yaml.v2 v2.4.0 // indirect
5152
gopkg.in/yaml.v3 v3.0.1 // indirect
52-
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
53-
k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 // indirect
54-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
55-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
53+
k8s.io/kube-openapi v0.0.0-20250304201544-e5f78fe3ede9 // indirect
54+
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
55+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
56+
sigs.k8s.io/randfill v1.0.0 // indirect
57+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
5658
sigs.k8s.io/yaml v1.4.0 // indirect
5759
)

0 commit comments

Comments
 (0)