Skip to content

Commit 3a00632

Browse files
author
shiftstack-merge-bot
committed
2 parents 2eb5c10 + 14469c4 commit 3a00632

File tree

46 files changed

+1675
-326
lines changed

Some content is hidden

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

46 files changed

+1675
-326
lines changed

‎.github/workflows/trivy.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Install go
1616
uses: actions/setup-go@v5
1717
with:
18-
go-version: 1.23.6
18+
go-version: 1.24.2
1919

2020
- name: Build an image from Dockerfile
2121
run: |

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

4 Bytes
Binary file not shown.

‎charts/latest/csi-driver-nfs/values.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ image:
1111
pullPolicy: IfNotPresent
1212
csiResizer:
1313
repository: registry.k8s.io/sig-storage/csi-resizer
14-
tag: v1.13.1
14+
tag: v1.13.2
1515
pullPolicy: IfNotPresent
1616
csiSnapshotter:
1717
repository: registry.k8s.io/sig-storage/csi-snapshotter
18-
tag: v8.2.0
18+
tag: v8.2.1
1919
pullPolicy: IfNotPresent
2020
livenessProbe:
2121
repository: registry.k8s.io/sig-storage/livenessprobe
@@ -27,7 +27,7 @@ image:
2727
pullPolicy: IfNotPresent
2828
externalSnapshotter:
2929
repository: registry.k8s.io/sig-storage/snapshot-controller
30-
tag: v8.2.0
30+
tag: v8.2.1
3131
pullPolicy: IfNotPresent
3232

3333
serviceAccount:

‎deploy/csi-nfs-controller.yaml‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,18 @@ spec:
4343
- "-v=2"
4444
- "--csi-address=$(ADDRESS)"
4545
- "--leader-election"
46-
- "--leader-election-namespace=kube-system"
46+
- "--leader-election-namespace=$(POD_NAMESPACE)"
4747
- "--extra-create-metadata=true"
4848
- "--feature-gates=HonorPVReclaimPolicy=true"
4949
- "--timeout=1200s"
5050
- "--retry-interval-max=30m"
5151
env:
5252
- name: ADDRESS
5353
value: /csi/csi.sock
54+
- name: POD_NAMESPACE
55+
valueFrom:
56+
fieldRef:
57+
fieldPath: metadata.namespace
5458
volumeMounts:
5559
- mountPath: /csi
5660
name: socket-dir
@@ -65,16 +69,20 @@ spec:
6569
drop:
6670
- ALL
6771
- name: csi-resizer
68-
image: registry.k8s.io/sig-storage/csi-resizer:v1.13.1
72+
image: registry.k8s.io/sig-storage/csi-resizer:v1.13.2
6973
args:
7074
- "-csi-address=$(ADDRESS)"
7175
- "-v=2"
7276
- "-leader-election"
73-
- "--leader-election-namespace=kube-system"
77+
- "--leader-election-namespace=$(POD_NAMESPACE)"
7478
- '-handle-volume-inuse-error=false'
7579
env:
7680
- name: ADDRESS
7781
value: /csi/csi.sock
82+
- name: POD_NAMESPACE
83+
valueFrom:
84+
fieldRef:
85+
fieldPath: metadata.namespace
7886
volumeMounts:
7987
- name: socket-dir
8088
mountPath: /csi
@@ -89,17 +97,21 @@ spec:
8997
drop:
9098
- ALL
9199
- name: csi-snapshotter
92-
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0
100+
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.1
93101
args:
94102
- "--v=2"
95103
- "--csi-address=$(ADDRESS)"
96-
- "--leader-election-namespace=kube-system"
104+
- "--leader-election-namespace=$(POD_NAMESPACE)"
97105
- "--leader-election"
98106
- "--timeout=1200s"
99107
- "--retry-interval-max=30m"
100108
env:
101109
- name: ADDRESS
102110
value: /csi/csi.sock
111+
- name: POD_NAMESPACE
112+
valueFrom:
113+
fieldRef:
114+
fieldPath: metadata.namespace
103115
imagePullPolicy: IfNotPresent
104116
volumeMounts:
105117
- name: socket-dir

‎deploy/csi-snapshot-controller.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,16 @@ spec:
5252
effect: "NoSchedule"
5353
containers:
5454
- name: snapshot-controller
55-
image: registry.k8s.io/sig-storage/snapshot-controller:v8.2.0
55+
image: registry.k8s.io/sig-storage/snapshot-controller:v8.2.1
5656
args:
5757
- "--v=2"
5858
- "--leader-election=true"
59-
- "--leader-election-namespace=kube-system"
59+
- "--leader-election-namespace=$(POD_NAMESPACE)"
60+
env:
61+
- name: POD_NAMESPACE
62+
valueFrom:
63+
fieldRef:
64+
fieldPath: metadata.namespace
6065
resources:
6166
limits:
6267
memory: 300Mi

‎go.mod‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ require (
99
github.com/onsi/gomega v1.37.0
1010
github.com/pborman/uuid v1.2.1
1111
github.com/stretchr/testify v1.10.0
12+
go.uber.org/goleak v1.3.0
1213
golang.org/x/net v0.39.0
13-
google.golang.org/grpc v1.71.1
14+
google.golang.org/grpc v1.72.0
1415
google.golang.org/protobuf v1.36.6
1516
k8s.io/api v0.31.6
1617
k8s.io/apimachinery v0.31.6
@@ -106,16 +107,16 @@ require (
106107
golang.org/x/crypto v0.37.0 // indirect
107108
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
108109
golang.org/x/mod v0.24.0
109-
golang.org/x/oauth2 v0.25.0 // indirect
110+
golang.org/x/oauth2 v0.26.0 // indirect
110111
golang.org/x/sync v0.13.0 // indirect
111112
golang.org/x/sys v0.32.0 // indirect
112113
golang.org/x/term v0.31.0 // indirect
113114
golang.org/x/text v0.24.0 // indirect
114115
golang.org/x/time v0.3.0 // indirect
115116
golang.org/x/tools v0.31.0 // indirect
116117
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
117-
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
118-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
118+
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
119+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
119120
gopkg.in/inf.v0 v0.9.1 // indirect
120121
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
121122
gopkg.in/yaml.v2 v2.4.0 // indirect

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -474,8 +474,8 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAG
474474
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
475475
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
476476
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
477-
golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=
478-
golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
477+
golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE=
478+
golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
479479
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
480480
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
481481
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -572,10 +572,10 @@ google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvx
572572
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
573573
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY=
574574
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo=
575-
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:GVIKPyP/kLIyVOgOnTwFOrvQaQUzOzGMCxgFUOEmm24=
576-
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw=
577-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI=
578-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50=
575+
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a h1:nwKuGPlUAt+aR+pcrkfFRrTU1BVrSmYyYMxYbUIVHr0=
576+
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a/go.mod h1:3kWAYMk1I75K4vykHtKt2ycnOgpA6974V7bREqbsenU=
577+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a h1:51aaUVRocpvUOSQKM6Q7VuoaktNIaMCLuhZB6DKksq4=
578+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a/go.mod h1:uRxBH1mhmO8PGhU89cMcHaXKZqO+OfakD8QQO0oYwlQ=
579579
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
580580
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
581581
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -584,8 +584,8 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ
584584
google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
585585
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
586586
google.golang.org/grpc v1.29.0/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
587-
google.golang.org/grpc v1.71.1 h1:ffsFWr7ygTUscGPI0KKK6TLrGz0476KUvvsbqWK0rPI=
588-
google.golang.org/grpc v1.71.1/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
587+
google.golang.org/grpc v1.72.0 h1:S7UkcVa60b5AAQTaO6ZKamFp1zMZSU0fGDK2WZLbBnM=
588+
google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
589589
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
590590
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
591591
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

‎pkg/nfs/utils.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ type TimeoutFunc func() (err error)
272272
// WaitUntilTimeout waits for the exec function to complete or return timeout error
273273
func WaitUntilTimeout(timeout time.Duration, execFunc ExecFunc, timeoutFunc TimeoutFunc) error {
274274
// Create a channel to receive the result of the exec function
275-
done := make(chan bool)
275+
done := make(chan bool, 1)
276276
var err error
277277

278278
// Start the exec function in a goroutine

‎pkg/nfs/utils_test.go‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import (
2323
"strings"
2424
"testing"
2525
"time"
26+
27+
"go.uber.org/goleak"
2628
)
2729

2830
var (
@@ -449,6 +451,7 @@ func TestRemoveEmptyDirs(t *testing.T) {
449451
}
450452

451453
func TestWaitUntilTimeout(t *testing.T) {
454+
defer goleak.VerifyNone(t)
452455
tests := []struct {
453456
desc string
454457
timeout time.Duration
@@ -494,8 +497,11 @@ func TestWaitUntilTimeout(t *testing.T) {
494497

495498
for _, test := range tests {
496499
err := WaitUntilTimeout(test.timeout, test.execFunc, test.timeoutFunc)
497-
if err != nil && (err.Error() != test.expectedErr.Error()) {
498-
t.Errorf("unexpected error: %v, expected error: %v", err, test.expectedErr)
500+
if err != nil {
501+
time.Sleep(2 * time.Second)
502+
if err.Error() != test.expectedErr.Error() {
503+
t.Errorf("unexpected error: %v, expected error: %v", err, test.expectedErr)
504+
}
499505
}
500506
}
501507
}

‎vendor/go.uber.org/goleak/.gitignore‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)