Skip to content

Commit 66ecc69

Browse files
committed
upgrading csi-lib-utils to v0.23
1 parent 10f64d2 commit 66ecc69

File tree

7 files changed

+204
-20
lines changed

7 files changed

+204
-20
lines changed

cmd/csi-attacher/main.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ var (
6969
workerThreads = flag.Uint("worker-threads", 10, "Number of attacher worker threads")
7070
maxEntries = flag.Int("max-entries", 0, "Max entries per each page in volume lister call, 0 means no limit.")
7171

72+
retryIntervalStart = flag.Duration("retry-interval-start", time.Second, "Initial retry interval of failed create volume or deletion. It doubles with each failure, up to retry-interval-max.")
73+
retryIntervalMax = flag.Duration("retry-interval-max", 5*time.Minute, "Maximum retry interval of failed create volume or deletion.")
74+
7275
defaultFSType = flag.String("default-fstype", "", "The default filesystem type of the volume to publish. Defaults to empty string")
7376

7477
reconcileSync = flag.Duration("reconcile-sync", 1*time.Minute, "Resync interval of the VolumeAttachment reconciler.")
@@ -270,8 +273,8 @@ func main() {
270273
handler,
271274
factory.Storage().V1().VolumeAttachments(),
272275
factory.Core().V1().PersistentVolumes(),
273-
workqueue.NewTypedItemExponentialFailureRateLimiter[string](standardflags.Configuration.RetryIntervalStart, standardflags.Configuration.RetryIntervalMax),
274-
workqueue.NewTypedItemExponentialFailureRateLimiter[string](standardflags.Configuration.RetryIntervalStart, standardflags.Configuration.RetryIntervalMax),
276+
workqueue.NewTypedItemExponentialFailureRateLimiter[string](*retryIntervalStart, *retryIntervalMax),
277+
workqueue.NewTypedItemExponentialFailureRateLimiter[string](*retryIntervalStart, *retryIntervalMax),
275278
supportsListVolumesPublishedNodes,
276279
*reconcileSync,
277280
)

go.mod

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
module github.com/kubernetes-csi/external-attacher
22

3-
go 1.24.0
4-
5-
toolchain go1.24.6
3+
go 1.24.6
64

75
require (
86
github.com/container-storage-interface/spec v1.11.0
97
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
108
github.com/evanphx/json-patch v5.9.11+incompatible
119
github.com/golang/mock v1.6.0
12-
github.com/kubernetes-csi/csi-lib-utils v0.22.0
10+
github.com/kubernetes-csi/csi-lib-utils v0.23.0
1311
github.com/kubernetes-csi/csi-test/v5 v5.3.1
1412
google.golang.org/grpc v1.72.1
1513
google.golang.org/protobuf v1.36.6
16-
k8s.io/api v0.34.0
17-
k8s.io/apimachinery v0.34.0
14+
k8s.io/api v0.34.1
15+
k8s.io/apimachinery v0.34.1
1816
k8s.io/apiserver v0.34.0
19-
k8s.io/client-go v0.34.0
20-
k8s.io/component-base v0.34.0
17+
k8s.io/client-go v0.34.1
18+
k8s.io/component-base v0.34.1
2119
k8s.io/csi-translation-lib v0.34.0
2220
k8s.io/klog/v2 v2.130.1
2321
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
9999
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
100100
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
101101
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
102-
github.com/kubernetes-csi/csi-lib-utils v0.22.0 h1:EUAs1+uHGps3OtVj4XVx16urhpI02eu+Z8Vps6plpHY=
103-
github.com/kubernetes-csi/csi-lib-utils v0.22.0/go.mod h1:f+PalKyS4Ujsjb9+m6Rj0W6c28y3nfea3paQ/VqjI28=
102+
github.com/kubernetes-csi/csi-lib-utils v0.23.0 h1:070SC4ubEvJpQak0ibxgv7l5dUoDVdqKyktam6zkm4s=
103+
github.com/kubernetes-csi/csi-lib-utils v0.23.0/go.mod h1:H5+JRXAvb7lpC4nrddI7sfQfaXA1O8Tek3uNrTIx1/g=
104104
github.com/kubernetes-csi/csi-test/v5 v5.3.1 h1:Wiukp1In+kif+BFo6q2ExjgB+MbrAz4jZWzGfijypuY=
105105
github.com/kubernetes-csi/csi-test/v5 v5.3.1/go.mod h1:7hA2cSYJ6T8CraEZPA6zqkLZwemjBD54XAnPsPC3VpA=
106106
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=

vendor/github.com/kubernetes-csi/csi-lib-utils/config/config.go

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

vendor/github.com/kubernetes-csi/csi-lib-utils/leaderelection/leader_election.go

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

vendor/github.com/kubernetes-csi/csi-lib-utils/standardflags/flags.go

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

vendor/modules.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,10 @@ github.com/josharian/intern
143143
# github.com/json-iterator/go v1.1.12
144144
## explicit; go 1.12
145145
github.com/json-iterator/go
146-
# github.com/kubernetes-csi/csi-lib-utils v0.22.0
147-
## explicit; go 1.24.0
146+
# github.com/kubernetes-csi/csi-lib-utils v0.23.0
147+
## explicit; go 1.24.6
148148
github.com/kubernetes-csi/csi-lib-utils/accessmodes
149+
github.com/kubernetes-csi/csi-lib-utils/config
149150
github.com/kubernetes-csi/csi-lib-utils/connection
150151
github.com/kubernetes-csi/csi-lib-utils/leaderelection
151152
github.com/kubernetes-csi/csi-lib-utils/metrics
@@ -519,7 +520,7 @@ gopkg.in/inf.v0
519520
# gopkg.in/yaml.v3 v3.0.1
520521
## explicit
521522
gopkg.in/yaml.v3
522-
# k8s.io/api v0.34.0 => k8s.io/api v0.34.0
523+
# k8s.io/api v0.34.1 => k8s.io/api v0.34.0
523524
## explicit; go 1.24.0
524525
k8s.io/api/admission/v1
525526
k8s.io/api/admission/v1beta1
@@ -581,7 +582,7 @@ k8s.io/api/storage/v1
581582
k8s.io/api/storage/v1alpha1
582583
k8s.io/api/storage/v1beta1
583584
k8s.io/api/storagemigration/v1alpha1
584-
# k8s.io/apimachinery v0.34.0 => k8s.io/apimachinery v0.34.0
585+
# k8s.io/apimachinery v0.34.1 => k8s.io/apimachinery v0.34.0
585586
## explicit; go 1.24.0
586587
k8s.io/apimachinery/pkg/api/equality
587588
k8s.io/apimachinery/pkg/api/errors
@@ -782,7 +783,7 @@ k8s.io/apiserver/pkg/util/x509metrics
782783
k8s.io/apiserver/pkg/validation
783784
k8s.io/apiserver/pkg/warning
784785
k8s.io/apiserver/plugin/pkg/authenticator/token/webhook
785-
# k8s.io/client-go v0.34.0 => k8s.io/client-go v0.34.0
786+
# k8s.io/client-go v0.34.1 => k8s.io/client-go v0.34.0
786787
## explicit; go 1.24.0
787788
k8s.io/client-go/applyconfigurations
788789
k8s.io/client-go/applyconfigurations/admissionregistration/v1
@@ -1118,7 +1119,7 @@ k8s.io/client-go/util/flowcontrol
11181119
k8s.io/client-go/util/homedir
11191120
k8s.io/client-go/util/keyutil
11201121
k8s.io/client-go/util/workqueue
1121-
# k8s.io/component-base v0.34.0 => k8s.io/component-base v0.34.0
1122+
# k8s.io/component-base v0.34.1 => k8s.io/component-base v0.34.0
11221123
## explicit; go 1.24.0
11231124
k8s.io/component-base/cli/flag
11241125
k8s.io/component-base/compatibility

0 commit comments

Comments
 (0)