Skip to content

Commit d93cdbb

Browse files
mdzrafmdzraf
committed
Adding Necessary Changes to Retry Infeasible Provisions at retryIntervalMax
1 parent 1a7e938 commit d93cdbb

File tree

11 files changed

+297
-28
lines changed

11 files changed

+297
-28
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,7 @@ func main() {
406406
controller.CreateProvisionedPVLimiter(workqueue.DefaultControllerRateLimiter()),
407407
controller.ClaimsInformer(claimInformer),
408408
controller.NodesLister(nodeLister),
409+
controller.RetryIntervalMax(*retryIntervalMax),
409410
}
410411

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

‎go.mod

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
)
3131

3232
require (
33-
github.com/go-logr/logr v1.4.2
33+
github.com/go-logr/logr v1.4.3
3434
github.com/google/go-cmp v0.7.0
3535
github.com/onsi/ginkgo/v2 v2.23.4
3636
github.com/onsi/gomega v1.37.0
@@ -147,8 +147,8 @@ require (
147147
k8s.io/kubelet v0.33.0 // indirect
148148
k8s.io/mount-utils v0.33.0 // indirect
149149
k8s.io/pod-security-admission v0.33.0 // indirect
150-
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
151-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.32.1 // indirect
150+
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
151+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.32.0 // indirect
152152
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
153153
sigs.k8s.io/randfill v1.0.0 // indirect
154154
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
@@ -214,3 +214,5 @@ replace k8s.io/mount-utils => k8s.io/mount-utils v0.33.0
214214
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.0
215215

216216
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.0
217+
218+
replace sigs.k8s.io/sig-storage-lib-external-provisioner/v11 => github.com/mdzraf/sig-storage-lib-external-provisioner/v11 v11.0.0-20250605135819-f6ebd1021d95

‎go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8
6060
github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
6161
github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
6262
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
63-
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
64-
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
63+
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
64+
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
6565
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
6666
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
6767
github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
@@ -127,6 +127,8 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
127127
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
128128
github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
129129
github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
130+
github.com/mdzraf/sig-storage-lib-external-provisioner/v11 v11.0.0-20250605135819-f6ebd1021d95 h1:fGUjp0u/wOK0dWD+DT/Iq1Dd7baAfcBKptzfalO4gjU=
131+
github.com/mdzraf/sig-storage-lib-external-provisioner/v11 v11.0.0-20250605135819-f6ebd1021d95/go.mod h1:/mNQ+pWDynWaxCcWOSTyKWasYdW1xZ4Grk4JjX53mBs=
130132
github.com/miekg/dns v1.1.66 h1:FeZXOS3VCVsKnEAd+wBkjMC3D2K+ww66Cq3VnCINuJE=
131133
github.com/miekg/dns v1.1.66/go.mod h1:jGFzBsSNbJw6z1HYut1RKBKHA9PBdxeHrZG8J+gC2WE=
132134
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible h1:aKW/4cBs+yK6gpqU3K/oIwk9Q/XICqd3zOX/UFuvqmk=
@@ -351,10 +353,10 @@ k8s.io/mount-utils v0.33.0 h1:hH6EcCcax4lFNIERaGMj6d7oGMW1qW3eTCwHUuLtLog=
351353
k8s.io/mount-utils v0.33.0/go.mod h1:1JR4rKymg8B8bCPo618hpSAdrpO6XLh0Acqok/xVwPE=
352354
k8s.io/pod-security-admission v0.33.0 h1:di/iicB5plCq+iQeqgf2s1N5DOSzTDiOOv5OiAbuYWE=
353355
k8s.io/pod-security-admission v0.33.0/go.mod h1:McuUMtSclLNxQdCkDTTWqKR79jnpHT/022GuanVU/Wg=
354-
k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
355-
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
356-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.32.1 h1:Cf+ed5N8038zbsaXFO7mKQDi/+VcSRafb0jM84KX5so=
357-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.32.1/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
356+
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 h1:jgJW5IePPXLGB8e/1wvd0Ich9QE97RvvF3a8J3fP/Lg=
357+
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
358+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.32.0 h1:XotDXzqvJ8Nx5eiZZueLpTuafJz8SiodgOemI+w87QU=
359+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.32.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
358360
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
359361
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
360362
sigs.k8s.io/gateway-api v1.3.0 h1:q6okN+/UKDATola4JY7zXzx40WO4VISk7i9DIfOvr9M=
@@ -364,8 +366,6 @@ sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh
364366
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
365367
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
366368
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
367-
sigs.k8s.io/sig-storage-lib-external-provisioner/v11 v11.0.1 h1:yB7zWcVJFLN9wB8XIOLaYL7H+XnnvwH94gcPuWZx7sk=
368-
sigs.k8s.io/sig-storage-lib-external-provisioner/v11 v11.0.1/go.mod h1:yWwEQYfQG/gSUQbLft2uTF/KPnoMt/cGj9vEMj5ripI=
369369
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
370370
sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
371371
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=

‎pkg/controller/controller.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"github.com/go-logr/logr"
2929

3030
"github.com/container-storage-interface/spec/lib/go/csi"
31+
"github.com/go-logr/logr"
3132
"github.com/kubernetes-csi/csi-lib-utils/accessmodes"
3233
"github.com/kubernetes-csi/external-provisioner/v5/pkg/features"
3334
"google.golang.org/grpc"

‎vendor/github.com/go-logr/logr/.golangci.yaml

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

‎vendor/github.com/go-logr/logr/funcr/funcr.go

Lines changed: 4 additions & 4 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/slowset/slowset.go

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

‎vendor/k8s.io/utils/buffer/ring_growing.go

Lines changed: 10 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 & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ github.com/fsnotify/fsnotify/internal
8989
# github.com/fxamacker/cbor/v2 v2.8.0
9090
## explicit; go 1.20
9191
github.com/fxamacker/cbor/v2
92-
# github.com/go-logr/logr v1.4.2
92+
# github.com/go-logr/logr v1.4.3
9393
## explicit; go 1.18
9494
github.com/go-logr/logr
9595
github.com/go-logr/logr/funcr
@@ -239,6 +239,7 @@ github.com/kubernetes-csi/csi-lib-utils/leaderelection
239239
github.com/kubernetes-csi/csi-lib-utils/metrics
240240
github.com/kubernetes-csi/csi-lib-utils/protosanitizer
241241
github.com/kubernetes-csi/csi-lib-utils/rpc
242+
github.com/kubernetes-csi/csi-lib-utils/slowset
242243
github.com/kubernetes-csi/csi-lib-utils/standardflags
243244
# github.com/kubernetes-csi/csi-test/v5 v5.3.1
244245
## explicit; go 1.18
@@ -1553,7 +1554,7 @@ k8s.io/mount-utils
15531554
## explicit; go 1.24.0
15541555
k8s.io/pod-security-admission/api
15551556
k8s.io/pod-security-admission/policy
1556-
# k8s.io/utils v0.0.0-20241210054802-24370beab758
1557+
# k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
15571558
## explicit; go 1.18
15581559
k8s.io/utils/buffer
15591560
k8s.io/utils/clock
@@ -1572,7 +1573,7 @@ k8s.io/utils/pointer
15721573
k8s.io/utils/ptr
15731574
k8s.io/utils/strings
15741575
k8s.io/utils/trace
1575-
# sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.32.1
1576+
# sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.32.0
15761577
## explicit; go 1.21
15771578
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client
15781579
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client/metrics
@@ -1636,8 +1637,8 @@ sigs.k8s.io/json/internal/golang/encoding/json
16361637
## explicit; go 1.18
16371638
sigs.k8s.io/randfill
16381639
sigs.k8s.io/randfill/bytesource
1639-
# sigs.k8s.io/sig-storage-lib-external-provisioner/v11 v11.0.1
1640-
## explicit; go 1.22.0
1640+
# sigs.k8s.io/sig-storage-lib-external-provisioner/v11 v11.0.1 => github.com/mdzraf/sig-storage-lib-external-provisioner/v11 v11.0.0-20250605135819-f6ebd1021d95
1641+
## explicit; go 1.24.0
16411642
sigs.k8s.io/sig-storage-lib-external-provisioner/v11/controller
16421643
sigs.k8s.io/sig-storage-lib-external-provisioner/v11/controller/metrics
16431644
sigs.k8s.io/sig-storage-lib-external-provisioner/v11/util
@@ -1682,3 +1683,4 @@ sigs.k8s.io/yaml/goyaml.v2
16821683
# k8s.io/mount-utils => k8s.io/mount-utils v0.33.0
16831684
# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.0
16841685
# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.0
1686+
# sigs.k8s.io/sig-storage-lib-external-provisioner/v11 => github.com/mdzraf/sig-storage-lib-external-provisioner/v11 v11.0.0-20250605135819-f6ebd1021d95

0 commit comments

Comments
 (0)