Skip to content

Commit 059aba2

Browse files
authored
Update to go-1.23, also update csi dependency (#64)
* Update to go-1.23, also update csi dependency * Silent dockerfile linter warnings
1 parent 5b27ea0 commit 059aba2

File tree

8 files changed

+145
-1555
lines changed

8 files changed

+145
-1555
lines changed

.github/workflows/docker.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
go-version-file: 'go.mod'
3232

3333
- name: Lint
34-
uses: golangci/golangci-lint-action@v4
34+
uses: golangci/golangci-lint-action@v6
3535
with:
3636
args: --build-tags integration -p bugs -p unused --timeout=10m
3737

@@ -76,7 +76,7 @@ jobs:
7676
7777
- name: Build and push controller image
7878
if: ${{ env.DOCKER_REGISTRY_TOKEN != '' }}
79-
uses: docker/build-push-action@v5
79+
uses: docker/build-push-action@v6
8080
with:
8181
context: .
8282
push: true
@@ -86,7 +86,7 @@ jobs:
8686

8787
- name: Build and push provisioner image
8888
if: ${{ env.DOCKER_REGISTRY_TOKEN != '' }}
89-
uses: docker/build-push-action@v5
89+
uses: docker/build-push-action@v6
9090
with:
9191
context: .
9292
push: true
+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
name: Release Drafter Action
3+
4+
on:
5+
push:
6+
branches:
7+
- main
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: release-drafter/release-drafter@v6
14+
env:
15+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

cmd/controller/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM golang:1.22-alpine as builder
1+
FROM golang:1.23-alpine AS builder
22
RUN apk add make binutils
33
COPY / /work
44
WORKDIR /work
55
RUN make controller
66

7-
FROM alpine:3.19
7+
FROM alpine:3.20
88
COPY --from=builder /work/bin/csi-lvm-controller /csi-lvm-controller
99
USER 65534
1010
ENTRYPOINT ["/csi-lvm-controller"]

cmd/controller/controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"k8s.io/apimachinery/pkg/api/resource"
1313
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1414
clientset "k8s.io/client-go/kubernetes"
15-
"sigs.k8s.io/sig-storage-lib-external-provisioner/v9/controller"
15+
"sigs.k8s.io/sig-storage-lib-external-provisioner/v10/controller"
1616

1717
"k8s.io/klog/v2"
1818
)

cmd/controller/main.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
clientset "k8s.io/client-go/kubernetes"
1111
"k8s.io/client-go/rest"
1212
"k8s.io/klog/v2"
13-
pvController "sigs.k8s.io/sig-storage-lib-external-provisioner/v9/controller"
13+
pvController "sigs.k8s.io/sig-storage-lib-external-provisioner/v10/controller"
1414
)
1515

1616
var (
@@ -153,13 +153,17 @@ func startDaemon(c *cli.Context) error {
153153

154154
provisioner := NewLVMProvisioner(kubeClient, namespace, vgName, mountPoint, devicePattern, provisionerImage, defaultLVMType, pullPolicy)
155155

156+
ctx := context.Background()
157+
logger := klog.FromContext(ctx)
158+
156159
pc := pvController.NewProvisionController(
160+
logger,
157161
kubeClient,
158162
provisionerName,
159163
provisioner,
160164
)
161165
klog.Info("Provisioner started")
162-
pc.Run(context.Background())
166+
pc.Run(ctx)
163167
klog.Info("Provisioner stopped")
164168
return nil
165169
}

cmd/provisioner/Dockerfile

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

7-
FROM alpine:3.19
7+
FROM alpine:3.20
88
RUN apk add lvm2 e2fsprogs e2fsprogs-extra smartmontools nvme-cli util-linux lvm2-dmeventd
99
COPY --from=builder /work/bin/csi-lvm-provisioner /csi-lvm-provisioner
1010
USER root

go.mod

+34-33
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
module github.com/metal-stack/csi-lvm
22

3-
go 1.22
3+
go 1.23.0
44

55
require (
66
github.com/google/lvmd v0.0.0-20200421122210-17bd8b9f710f
7-
github.com/urfave/cli/v2 v2.27.1
8-
k8s.io/api v0.27.11
9-
k8s.io/apimachinery v0.27.11
10-
k8s.io/client-go v0.27.11
11-
k8s.io/klog/v2 v2.120.1
12-
sigs.k8s.io/sig-storage-lib-external-provisioner/v9 v9.0.3
7+
github.com/urfave/cli/v2 v2.27.4
8+
k8s.io/api v0.31.0
9+
k8s.io/apimachinery v0.31.0
10+
k8s.io/client-go v0.31.0
11+
k8s.io/klog/v2 v2.130.1
12+
sigs.k8s.io/sig-storage-lib-external-provisioner/v10 v10.0.1
1313
)
1414

1515
require (
1616
github.com/beorn7/perks v1.0.1 // indirect
17-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
18-
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
19-
github.com/davecgh/go-spew v1.1.1 // indirect
20-
github.com/emicklei/go-restful/v3 v3.11.3 // indirect
21-
github.com/go-logr/logr v1.4.1 // indirect
22-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
23-
github.com/go-openapi/jsonreference v0.20.4 // indirect
24-
github.com/go-openapi/swag v0.22.9 // indirect
17+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
18+
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
19+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
20+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
21+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
22+
github.com/go-logr/logr v1.4.2 // indirect
23+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
24+
github.com/go-openapi/jsonreference v0.21.0 // indirect
25+
github.com/go-openapi/swag v0.23.0 // indirect
2526
github.com/gogo/protobuf v1.3.2 // indirect
2627
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
27-
github.com/golang/protobuf v1.5.3 // indirect
28-
github.com/google/gnostic v0.7.0 // indirect
28+
github.com/golang/protobuf v1.5.4 // indirect
2929
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
3030
github.com/google/go-cmp v0.6.0 // indirect
3131
github.com/google/gofuzz v1.2.0 // indirect
@@ -39,28 +39,29 @@ require (
3939
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4040
github.com/opentracing/opentracing-go v1.2.0 // indirect
4141
github.com/prometheus/client_golang v1.19.0 // indirect
42-
github.com/prometheus/client_model v0.6.0 // indirect
42+
github.com/prometheus/client_model v0.6.1 // indirect
4343
github.com/prometheus/common v0.48.0 // indirect
4444
github.com/prometheus/procfs v0.12.0 // indirect
4545
github.com/russross/blackfriday/v2 v2.1.0 // indirect
46-
github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e // indirect
47-
golang.org/x/mod v0.15.0 // indirect
48-
golang.org/x/net v0.21.0 // indirect
49-
golang.org/x/oauth2 v0.17.0 // indirect
50-
golang.org/x/sys v0.17.0 // indirect
51-
golang.org/x/term v0.17.0 // indirect
52-
golang.org/x/text v0.14.0 // indirect
53-
golang.org/x/time v0.5.0 // indirect
54-
golang.org/x/tools v0.18.0 // indirect
55-
google.golang.org/appengine v1.6.8 // indirect
56-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect
57-
google.golang.org/grpc v1.62.0 // indirect
58-
google.golang.org/protobuf v1.32.0 // indirect
46+
github.com/x448/float16 v0.8.4 // indirect
47+
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
48+
golang.org/x/mod v0.21.0 // indirect
49+
golang.org/x/net v0.29.0 // indirect
50+
golang.org/x/oauth2 v0.23.0 // indirect
51+
golang.org/x/sync v0.8.0 // indirect
52+
golang.org/x/sys v0.25.0 // indirect
53+
golang.org/x/term v0.24.0 // indirect
54+
golang.org/x/text v0.18.0 // indirect
55+
golang.org/x/time v0.6.0 // indirect
56+
golang.org/x/tools v0.24.0 // indirect
57+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
58+
google.golang.org/grpc v1.66.0 // indirect
59+
google.golang.org/protobuf v1.34.2 // indirect
5960
gopkg.in/inf.v0 v0.9.1 // indirect
6061
gopkg.in/yaml.v2 v2.4.0 // indirect
6162
gopkg.in/yaml.v3 v3.0.1 // indirect
62-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
63-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
63+
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
64+
k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 // indirect
6465
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
6566
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
6667
sigs.k8s.io/yaml v1.4.0 // indirect

0 commit comments

Comments
 (0)