Skip to content

Commit 1b94dad

Browse files
mdzrafmdzraf
committed
Adding Necessary Changes to Retry Infeasible Provisions at retryIntervalMax
1 parent 5aa6d9e commit 1b94dad

File tree

9 files changed

+289
-20
lines changed

9 files changed

+289
-20
lines changed

‎cmd/csi-provisioner/csi-provisioner.go

+1
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@ func main() {
404404
controller.CreateProvisionedPVLimiter(workqueue.DefaultControllerRateLimiter()),
405405
controller.ClaimsInformer(claimInformer),
406406
controller.NodesLister(nodeLister),
407+
controller.RetryIntervalMax(*retryIntervalMax),
407408
}
408409

409410
if utilfeature.DefaultFeatureGate.Enabled(features.HonorPVReclaimPolicy) {

‎go.mod

+4
Original file line numberDiff line numberDiff line change
@@ -226,3 +226,7 @@ replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.0
226226
replace k8s.io/cri-client => k8s.io/cri-client v0.32.0
227227

228228
replace k8s.io/externaljwt => k8s.io/externaljwt v0.32.0
229+
230+
replace github.com/kubernetes-csi/csi-lib-utils => github.com/mdzraf/csi-lib-utils v0.0.0-20250408153324-d3fabff50cd7
231+
232+
replace sigs.k8s.io/sig-storage-lib-external-provisioner/v11 => github.com/mdzraf/sig-storage-lib-external-provisioner/v11 v11.0.0-20250425170941-c0d82f7c5539

‎go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,6 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
139139
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
140140
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
141141
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
142-
github.com/kubernetes-csi/csi-lib-utils v0.21.0 h1:dUN/iIgXLucAxyML2iPyhniIlACQumIeAJmIzsMBddc=
143-
github.com/kubernetes-csi/csi-lib-utils v0.21.0/go.mod h1:ZCVRTYuup+bwX9tOeE5Q3LDw64QvltSwMUQ3M3g2T+Q=
144142
github.com/kubernetes-csi/csi-test/v5 v5.3.1 h1:Wiukp1In+kif+BFo6q2ExjgB+MbrAz4jZWzGfijypuY=
145143
github.com/kubernetes-csi/csi-test/v5 v5.3.1/go.mod h1:7hA2cSYJ6T8CraEZPA6zqkLZwemjBD54XAnPsPC3VpA=
146144
github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0 h1:Q3jQ1NkFqv5o+F8dMmHd8SfEmlcwNeo1immFApntEwE=
@@ -149,6 +147,10 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
149147
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
150148
github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
151149
github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
150+
github.com/mdzraf/csi-lib-utils v0.0.0-20250408153324-d3fabff50cd7 h1:JllU3CpmTDNDNXHDmk/e3og5+p+5gyKJmxTvkmihVuk=
151+
github.com/mdzraf/csi-lib-utils v0.0.0-20250408153324-d3fabff50cd7/go.mod h1:ZCVRTYuup+bwX9tOeE5Q3LDw64QvltSwMUQ3M3g2T+Q=
152+
github.com/mdzraf/sig-storage-lib-external-provisioner/v11 v11.0.0-20250425170941-c0d82f7c5539 h1:sEoaUIMRvxLqJkuqqHLEP9/z/DYcUO/lKQ0oSr3cavU=
153+
github.com/mdzraf/sig-storage-lib-external-provisioner/v11 v11.0.0-20250425170941-c0d82f7c5539/go.mod h1:7hmSuEc8KoaaRxE3P5K1T2WEQP5e6TvWyad3AB5erBc=
152154
github.com/miekg/dns v1.1.65 h1:0+tIPHzUW0GCge7IiK3guGP57VAw7hoPDfApjkMD1Fc=
153155
github.com/miekg/dns v1.1.65/go.mod h1:Dzw9769uoKVaLuODMDZz9M6ynFU6Em65csPuoi8G0ck=
154156
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible h1:aKW/4cBs+yK6gpqU3K/oIwk9Q/XICqd3zOX/UFuvqmk=
@@ -415,8 +417,6 @@ sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7np
415417
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
416418
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016 h1:kXv6kKdoEtedwuqMmkqhbkgvYKeycVbC8+iPCP9j5kQ=
417419
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
418-
sigs.k8s.io/sig-storage-lib-external-provisioner/v11 v11.0.1 h1:yB7zWcVJFLN9wB8XIOLaYL7H+XnnvwH94gcPuWZx7sk=
419-
sigs.k8s.io/sig-storage-lib-external-provisioner/v11 v11.0.1/go.mod h1:yWwEQYfQG/gSUQbLft2uTF/KPnoMt/cGj9vEMj5ripI=
420420
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
421421
sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
422422
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=

‎pkg/controller/controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ import (
2020
"context"
2121
"errors"
2222
"fmt"
23-
"github.com/go-logr/logr"
2423
"os"
2524
"strconv"
2625
"strings"
2726
"time"
2827

2928
"github.com/container-storage-interface/spec/lib/go/csi"
29+
"github.com/go-logr/logr"
3030
"github.com/kubernetes-csi/csi-lib-utils/accessmodes"
3131
"github.com/kubernetes-csi/external-provisioner/v5/pkg/features"
3232
"google.golang.org/grpc"

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

+21-11
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/slowset/slowset.go

+118
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

+6-3
Original file line numberDiff line numberDiff line change
@@ -265,14 +265,15 @@ github.com/klauspost/compress/internal/le
265265
github.com/klauspost/compress/internal/snapref
266266
github.com/klauspost/compress/zstd
267267
github.com/klauspost/compress/zstd/internal/xxhash
268-
# github.com/kubernetes-csi/csi-lib-utils v0.21.0
268+
# github.com/kubernetes-csi/csi-lib-utils v0.21.0 => github.com/mdzraf/csi-lib-utils v0.0.0-20250408153324-d3fabff50cd7
269269
## explicit; go 1.23.1
270270
github.com/kubernetes-csi/csi-lib-utils/accessmodes
271271
github.com/kubernetes-csi/csi-lib-utils/connection
272272
github.com/kubernetes-csi/csi-lib-utils/leaderelection
273273
github.com/kubernetes-csi/csi-lib-utils/metrics
274274
github.com/kubernetes-csi/csi-lib-utils/protosanitizer
275275
github.com/kubernetes-csi/csi-lib-utils/rpc
276+
github.com/kubernetes-csi/csi-lib-utils/slowset
276277
# github.com/kubernetes-csi/csi-test/v5 v5.3.1
277278
## explicit; go 1.18
278279
github.com/kubernetes-csi/csi-test/v5/driver
@@ -1828,8 +1829,8 @@ sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1beta1
18281829
## explicit; go 1.23
18291830
sigs.k8s.io/json
18301831
sigs.k8s.io/json/internal/golang/encoding/json
1831-
# sigs.k8s.io/sig-storage-lib-external-provisioner/v11 v11.0.1
1832-
## explicit; go 1.22.0
1832+
# sigs.k8s.io/sig-storage-lib-external-provisioner/v11 v11.0.1 => github.com/mdzraf/sig-storage-lib-external-provisioner/v11 v11.0.0-20250425170941-c0d82f7c5539
1833+
## explicit; go 1.23.1
18331834
sigs.k8s.io/sig-storage-lib-external-provisioner/v11/controller
18341835
sigs.k8s.io/sig-storage-lib-external-provisioner/v11/controller/metrics
18351836
sigs.k8s.io/sig-storage-lib-external-provisioner/v11/util
@@ -1874,3 +1875,5 @@ sigs.k8s.io/yaml/goyaml.v2
18741875
# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.0
18751876
# k8s.io/cri-client => k8s.io/cri-client v0.32.0
18761877
# k8s.io/externaljwt => k8s.io/externaljwt v0.32.0
1878+
# github.com/kubernetes-csi/csi-lib-utils => github.com/mdzraf/csi-lib-utils v0.0.0-20250408153324-d3fabff50cd7
1879+
# sigs.k8s.io/sig-storage-lib-external-provisioner/v11 => github.com/mdzraf/sig-storage-lib-external-provisioner/v11 v11.0.0-20250425170941-c0d82f7c5539

0 commit comments

Comments
 (0)