Skip to content

Commit f64c593

Browse files
7ing7ing
committed
Upgrade golang 1.23 and support CSI spec v1.10.0
Also upgraded dependencies: github.com/cert-manager/cert-manager => v1.15.3 github.com/go-logr/logr => v1.4.2 github.com/kubernetes-csi/csi-lib-utils => v0.19.0 github.com/stretchr/testify => v1.9.0 google.golang.org/grpc => v1.66.2 k8s.io/* => v0.31.1 k8s.io/klog/v2 => v2.130.1 Signed-off-by: Jing Liu <[email protected]>
1 parent bff7666 commit f64c593

File tree

5 files changed

+214
-171
lines changed

5 files changed

+214
-171
lines changed

‎driver/controllerserver.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
var _ csi.ControllerServer = &controllerServer{} // compiler validation
2828

2929
type controllerServer struct {
30+
csi.UnimplementedControllerServer
3031
}
3132

3233
func (cs *controllerServer) ControllerModifyVolume(ctx context.Context, request *csi.ControllerModifyVolumeRequest) (*csi.ControllerModifyVolumeResponse, error) {

‎driver/identityserver.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,11 @@ import (
2727
type identityServer struct {
2828
name string
2929
version string
30+
csi.UnimplementedIdentityServer
3031
}
3132

33+
var _ csi.IdentityServer = &identityServer{} // compiler checks
34+
3235
func NewIdentityServer(name, version string) *identityServer {
3336
return &identityServer{
3437
name: name,

‎driver/nodeserver.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,12 @@ type nodeServer struct {
4242
log logr.Logger
4343

4444
continueOnNotReady bool
45+
46+
csi.UnimplementedNodeServer
4547
}
4648

49+
var _ csi.NodeServer = &nodeServer{} // compiler checks
50+
4751
func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolumeRequest) (*csi.NodePublishVolumeResponse, error) {
4852
meta := metadata.FromNodePublishVolumeRequest(req)
4953
log := loggerForMetadata(ns.log, meta)

‎go.mod

Lines changed: 52 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,85 @@
11
module github.com/cert-manager/csi-lib
22

3-
go 1.21
3+
go 1.23
44

55
require (
6-
github.com/cert-manager/cert-manager v1.13.2
7-
github.com/container-storage-interface/spec v1.9.0
8-
github.com/go-logr/logr v1.3.0
9-
github.com/kubernetes-csi/csi-lib-utils v0.15.0
10-
github.com/stretchr/testify v1.8.4
11-
google.golang.org/grpc v1.59.0
12-
k8s.io/apimachinery v0.28.4
13-
k8s.io/client-go v0.28.4
14-
k8s.io/klog/v2 v2.110.1
15-
k8s.io/mount-utils v0.28.4
16-
k8s.io/utils v0.0.0-20231127182322-b307cd553661
6+
github.com/cert-manager/cert-manager v1.15.3
7+
github.com/container-storage-interface/spec v1.10.0
8+
github.com/go-logr/logr v1.4.2
9+
github.com/kubernetes-csi/csi-lib-utils v0.19.0
10+
github.com/stretchr/testify v1.9.0
11+
google.golang.org/grpc v1.66.2
12+
k8s.io/apimachinery v0.31.1
13+
k8s.io/client-go v0.31.1
14+
k8s.io/klog/v2 v2.130.1
15+
k8s.io/mount-utils v0.31.1
16+
k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3
1717
)
1818

1919
require (
2020
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
2121
github.com/beorn7/perks v1.0.1 // indirect
2222
github.com/blang/semver/v4 v4.0.0 // indirect
23-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
23+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
24+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
2425
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
25-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
26-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
27-
github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
28-
github.com/go-ldap/ldap/v3 v3.4.6 // indirect
26+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
27+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
28+
github.com/go-asn1-ber/asn1-ber v1.5.7 // indirect
29+
github.com/go-ldap/ldap/v3 v3.4.8 // indirect
2930
github.com/go-logr/zapr v1.3.0 // indirect
30-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
31-
github.com/go-openapi/jsonreference v0.20.2 // indirect
32-
github.com/go-openapi/swag v0.22.4 // indirect
31+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
32+
github.com/go-openapi/jsonreference v0.21.0 // indirect
33+
github.com/go-openapi/swag v0.23.0 // indirect
34+
github.com/godbus/dbus/v5 v5.1.0 // indirect
3335
github.com/gogo/protobuf v1.3.2 // indirect
34-
github.com/golang/protobuf v1.5.3 // indirect
36+
github.com/golang/protobuf v1.5.4 // indirect
3537
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
3638
github.com/google/go-cmp v0.6.0 // indirect
3739
github.com/google/gofuzz v1.2.0 // indirect
38-
github.com/google/uuid v1.4.0 // indirect
40+
github.com/google/uuid v1.6.0 // indirect
3941
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4042
github.com/josharian/intern v1.0.0 // indirect
4143
github.com/json-iterator/go v1.1.12 // indirect
44+
github.com/klauspost/compress v1.17.9 // indirect
4245
github.com/mailru/easyjson v0.7.7 // indirect
43-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
44-
github.com/moby/sys/mountinfo v0.7.1 // indirect
46+
github.com/moby/sys/mountinfo v0.7.2 // indirect
4547
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4648
github.com/modern-go/reflect2 v1.0.2 // indirect
4749
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
50+
github.com/opencontainers/runc v1.1.14 // indirect
51+
github.com/opencontainers/runtime-spec v1.2.0 // indirect
4852
github.com/pkg/errors v0.9.1 // indirect
4953
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
50-
github.com/prometheus/client_golang v1.17.0 // indirect
51-
github.com/prometheus/client_model v0.5.0 // indirect
52-
github.com/prometheus/common v0.45.0 // indirect
53-
github.com/prometheus/procfs v0.12.0 // indirect
54-
github.com/spf13/cobra v1.8.0 // indirect
54+
github.com/prometheus/client_golang v1.20.4 // indirect
55+
github.com/prometheus/client_model v0.6.1 // indirect
56+
github.com/prometheus/common v0.59.1 // indirect
57+
github.com/prometheus/procfs v0.15.1 // indirect
58+
github.com/sirupsen/logrus v1.9.3 // indirect
59+
github.com/spf13/cobra v1.8.1 // indirect
5560
github.com/spf13/pflag v1.0.5 // indirect
61+
github.com/x448/float16 v0.8.4 // indirect
5662
go.uber.org/multierr v1.11.0 // indirect
57-
go.uber.org/zap v1.26.0 // indirect
58-
golang.org/x/crypto v0.16.0 // indirect
59-
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
60-
golang.org/x/net v0.19.0 // indirect
61-
golang.org/x/oauth2 v0.15.0 // indirect
62-
golang.org/x/sys v0.15.0 // indirect
63-
golang.org/x/term v0.15.0 // indirect
64-
golang.org/x/text v0.14.0 // indirect
65-
golang.org/x/time v0.5.0 // indirect
66-
google.golang.org/appengine v1.6.8 // indirect
67-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect
68-
google.golang.org/protobuf v1.31.0 // indirect
63+
go.uber.org/zap v1.27.0 // indirect
64+
golang.org/x/crypto v0.27.0 // indirect
65+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
66+
golang.org/x/net v0.29.0 // indirect
67+
golang.org/x/oauth2 v0.23.0 // indirect
68+
golang.org/x/sys v0.25.0 // indirect
69+
golang.org/x/term v0.24.0 // indirect
70+
golang.org/x/text v0.18.0 // indirect
71+
golang.org/x/time v0.6.0 // indirect
72+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
73+
google.golang.org/protobuf v1.34.2 // indirect
74+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6975
gopkg.in/inf.v0 v0.9.1 // indirect
7076
gopkg.in/yaml.v2 v2.4.0 // indirect
7177
gopkg.in/yaml.v3 v3.0.1 // indirect
72-
k8s.io/api v0.28.4 // indirect
73-
k8s.io/apiextensions-apiserver v0.28.4 // indirect
74-
k8s.io/component-base v0.28.4 // indirect
75-
k8s.io/kube-aggregator v0.28.4 // indirect
76-
k8s.io/kube-openapi v0.0.0-20231129212854-f0671cc7e66a // indirect
77-
sigs.k8s.io/gateway-api v1.0.0 // indirect
78+
k8s.io/api v0.31.1 // indirect
79+
k8s.io/apiextensions-apiserver v0.31.1 // indirect
80+
k8s.io/component-base v0.31.1 // indirect
81+
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
82+
sigs.k8s.io/gateway-api v1.1.0 // indirect
7883
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7984
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
8085
sigs.k8s.io/yaml v1.4.0 // indirect

0 commit comments

Comments
 (0)