Skip to content

Commit 556eb49

Browse files
author
shiftstack-merge-bot
committed
2 parents 32e7759 + 349c9b3 commit 556eb49

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+9294
-4542
lines changed

‎.github/dependabot.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,14 @@ updates:
1818
- "release-note-none"
1919
- "ok-to-test"
2020
open-pull-requests-limit: 1
21+
- package-ecosystem: "docker"
22+
directory: "./"
23+
schedule:
24+
interval: "daily"
25+
time: "01:00"
26+
timezone: "Asia/Shanghai"
27+
labels:
28+
- "area/dependency"
29+
- "release-note-none"
30+
- "ok-to-test"
31+
- "kind/cleanup"

‎charts/latest/csi-driver-nfs-v0.0.0.tgz‎

-48 Bytes
Binary file not shown.

‎charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,6 @@ spec:
7070
{{- else }}
7171
image: "{{ .Values.image.nodeDriverRegistrar.repository }}:{{ .Values.image.nodeDriverRegistrar.tag }}"
7272
{{- end }}
73-
livenessProbe:
74-
exec:
75-
command:
76-
- /csi-node-driver-registrar
77-
- --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
78-
- --mode=kubelet-registration-probe
79-
initialDelaySeconds: 30
80-
timeoutSeconds: 15
8173
args:
8274
- --v=2
8375
- --csi-address=/csi/csi.sock

‎deploy/csi-nfs-node.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,6 @@ spec:
5555
- --v=2
5656
- --csi-address=/csi/csi.sock
5757
- --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
58-
livenessProbe:
59-
exec:
60-
command:
61-
- /csi-node-driver-registrar
62-
- --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
63-
- --mode=kubelet-registration-probe
64-
initialDelaySeconds: 30
65-
timeoutSeconds: 15
6658
env:
6759
- name: DRIVER_REG_SOCK_PATH
6860
value: /var/lib/kubelet/plugins/csi-nfsplugin/csi.sock

‎docs/csi-debug.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ csi-nfs-controller-56bfddd689-sl4ll 5/5 Running 0 35s 10
1111
```
1212
- get pod description and logs
1313
```console
14-
$ kubectl describe csi-nfs-controller-56bfddd689-dh5tk -n kube-system > csi-nfs-controller-description.log
14+
$ kubectl describe pod csi-nfs-controller-56bfddd689-dh5tk -n kube-system > csi-nfs-controller-description.log
1515
$ kubectl logs csi-nfs-controller-56bfddd689-dh5tk -c nfs -n kube-system > csi-nfs-controller.log
1616
```
1717

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ go 1.22.7
55
toolchain go1.23.2
66

77
require (
8-
github.com/container-storage-interface/spec v1.8.0
8+
github.com/container-storage-interface/spec v1.11.0
99
github.com/kubernetes-csi/csi-lib-utils v0.9.0
10-
github.com/onsi/ginkgo/v2 v2.21.0
11-
github.com/onsi/gomega v1.35.1
10+
github.com/onsi/ginkgo/v2 v2.22.0
11+
github.com/onsi/gomega v1.36.0
1212
github.com/pborman/uuid v1.2.1
1313
github.com/stretchr/testify v1.9.0
1414
golang.org/x/net v0.31.0
1515
google.golang.org/grpc v1.68.0
16-
google.golang.org/protobuf v1.35.1
16+
google.golang.org/protobuf v1.35.2
1717
k8s.io/api v0.28.12
1818
k8s.io/apimachinery v0.28.12
1919
k8s.io/client-go v0.28.12

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX
8585
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 h1:QVw89YDxXxEe+l8gU8ETbOasdwEV+avkR75ZzsVV9WI=
8686
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
8787
github.com/container-storage-interface/spec v1.2.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4=
88-
github.com/container-storage-interface/spec v1.8.0 h1:D0vhF3PLIZwlwZEf2eNbpujGCNwspwTYf2idJRJx4xI=
89-
github.com/container-storage-interface/spec v1.8.0/go.mod h1:ROLik+GhPslwwWRNFF1KasPzroNARibH2rfz1rkg4H0=
88+
github.com/container-storage-interface/spec v1.11.0 h1:H/YKTOeUZwHtyPOr9raR+HgFmGluGCklulxDYxSdVNM=
89+
github.com/container-storage-interface/spec v1.11.0/go.mod h1:DtUvaQszPml1YJfIK7c00mlv6/g4wNMLanLgiUbKFRI=
9090
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
9191
github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
9292
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
@@ -288,12 +288,12 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+
288288
github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
289289
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
290290
github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
291-
github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
292-
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
291+
github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg=
292+
github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
293293
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
294294
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
295-
github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
296-
github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
295+
github.com/onsi/gomega v1.36.0 h1:Pb12RlruUtj4XUuPUqeEWc6j5DkVVVA49Uf6YLfC95Y=
296+
github.com/onsi/gomega v1.36.0/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
297297
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
298298
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
299299
github.com/opencontainers/selinux v1.10.0 h1:rAiKF8hTcgLI3w0DHm6i0ylVVcOrlgR1kK99DRLDhyU=
@@ -599,8 +599,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
599599
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
600600
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
601601
google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
602-
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
603-
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
602+
google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
603+
google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
604604
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
605605
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
606606
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎pkg/nfs/controllerserver.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import (
4040
// ControllerServer controller server setting
4141
type ControllerServer struct {
4242
Driver *Driver
43+
csi.UnimplementedControllerServer
4344
}
4445

4546
// nfsVolume is an internal representation of a volume
@@ -347,6 +348,10 @@ func (cs *ControllerServer) GetCapacity(_ context.Context, _ *csi.GetCapacityReq
347348
return nil, status.Error(codes.Unimplemented, "")
348349
}
349350

351+
func (d *Driver) ControllerModifyVolume(_ context.Context, _ *csi.ControllerModifyVolumeRequest) (*csi.ControllerModifyVolumeResponse, error) {
352+
return nil, status.Error(codes.Unimplemented, "")
353+
}
354+
350355
// ControllerGetCapabilities implements the default GRPC callout.
351356
// Default supports all capabilities
352357
func (cs *ControllerServer) ControllerGetCapabilities(_ context.Context, _ *csi.ControllerGetCapabilitiesRequest) (*csi.ControllerGetCapabilitiesResponse, error) {

‎pkg/nfs/identityserver.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626

2727
type IdentityServer struct {
2828
Driver *Driver
29+
csi.UnimplementedIdentityServer
2930
}
3031

3132
func (ids *IdentityServer) GetPluginInfo(_ context.Context, _ *csi.GetPluginInfoRequest) (*csi.GetPluginInfoResponse, error) {

‎pkg/nfs/identityserver_test.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ func TestProbe(t *testing.T) {
7373
resp, err := fakeIdentityServer.Probe(context.Background(), &req)
7474
assert.NoError(t, err)
7575
assert.NotNil(t, resp)
76-
assert.Equal(t, resp.XXX_sizecache, int32(0))
7776
assert.Equal(t, resp.Ready.Value, true)
7877
}
7978

@@ -96,7 +95,6 @@ func TestGetPluginCapabilities(t *testing.T) {
9695
resp, err := fakeIdentityServer.GetPluginCapabilities(context.Background(), &req)
9796
assert.NoError(t, err)
9897
assert.NotNil(t, resp)
99-
assert.Equal(t, resp.XXX_sizecache, int32(0))
10098
assert.Equal(t, resp.Capabilities, expectedCap)
10199

102100
}

0 commit comments

Comments
 (0)