kubernetes
/
kube-controller-manager
mirror of https://github.com/kubernetes/kube-controller-manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #120344 from rohitssingh/disable_force_detach 

Add a flag to disable force detach behavior in kube-controller-manager

Kubernetes-commit: 31a482a14937f8421de62b1416ab150ee1b3ff25
This commit is contained in:
Kubernetes Publisher 2024-02-22 13:02:38 -08:00
parent 946d398f14 632c2ba7c3
commit c77babefb4
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/v1alpha1/types.go
View File

@ -179,6 +179,10 @@ type AttachDetachControllerConfiguration struct {
// ReconcilerSyncLoopPeriod is the amount of time the reconciler sync states loop // ReconcilerSyncLoopPeriod is the amount of time the reconciler sync states loop
// wait between successive executions. Is set to 60 sec by default. // wait between successive executions. Is set to 60 sec by default.
ReconcilerSyncLoopPeriod metav1.Duration ReconcilerSyncLoopPeriod metav1.Duration
// DisableForceDetachOnTimeout disables force detach when the maximum unmount
// time is exceeded. Is false by default, and thus force detach on unmount is
// enabled.
DisableForceDetachOnTimeout bool `json:"disableForceDetachOnTimeout"`
} }
// CSRSigningControllerConfiguration contains elements describing CSRSigningController. // CSRSigningControllerConfiguration contains elements describing CSRSigningController.

6
go.mod
View File

@ -6,7 +6,7 @@ go 1.21
require ( require (
k8s.io/apimachinery v0.0.0-20240221202133-0f2e9357997f k8s.io/apimachinery v0.0.0-20240221202133-0f2e9357997f
k8s.io/cloud-provider v0.0.0-20240221210127-14a6b79597e0 k8s.io/cloud-provider v0.0.0-20240222010000-7a7cd07d276e
k8s.io/controller-manager v0.0.0-20240221205959-08cdda213210 k8s.io/controller-manager v0.0.0-20240221205959-08cdda213210
) )
@ -33,9 +33,9 @@ require (
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20240221202343-ffee488e7bd8 k8s.io/api => k8s.io/api v0.0.0-20240221202343-ffee488e7bd8
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240221202133-0f2e9357997f k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240221202133-0f2e9357997f
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20240221203858-fe1489716d57 k8s.io/apiserver => k8s.io/apiserver v0.0.0-20240222203853-f08c74c02dec
k8s.io/client-go => k8s.io/client-go v0.0.0-20240221202651-8c4efe8d079e k8s.io/client-go => k8s.io/client-go v0.0.0-20240221202651-8c4efe8d079e
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20240221210127-14a6b79597e0 k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20240222010000-7a7cd07d276e
k8s.io/component-base => k8s.io/component-base v0.0.0-20240221203243-4876638a4138 k8s.io/component-base => k8s.io/component-base v0.0.0-20240221203243-4876638a4138
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20240221203355-866cab6f8733 k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20240221203355-866cab6f8733
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20240221205959-08cdda213210 k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20240221205959-08cdda213210

4
go.sum
View File

@ -83,8 +83,8 @@ k8s.io/api v0.0.0-20240221202343-ffee488e7bd8 h1:K3vOhiu2OcPzv/gdniojRhysSxAyc5i
k8s.io/api v0.0.0-20240221202343-ffee488e7bd8/go.mod h1:kCYq4mrNBxRaHCZeTveL6//1FveIDm3wxJZeFNKF6b8= k8s.io/api v0.0.0-20240221202343-ffee488e7bd8/go.mod h1:kCYq4mrNBxRaHCZeTveL6//1FveIDm3wxJZeFNKF6b8=
k8s.io/apimachinery v0.0.0-20240221202133-0f2e9357997f h1:IvhurYeUUiUsNbDhVJHvOwhgfpUoobqtGQGat2VxfcQ= k8s.io/apimachinery v0.0.0-20240221202133-0f2e9357997f h1:IvhurYeUUiUsNbDhVJHvOwhgfpUoobqtGQGat2VxfcQ=
k8s.io/apimachinery v0.0.0-20240221202133-0f2e9357997f/go.mod h1:/862Kkwje5hhHGJWPKiaHuov2c6mw6uCXWikV9kOIP4= k8s.io/apimachinery v0.0.0-20240221202133-0f2e9357997f/go.mod h1:/862Kkwje5hhHGJWPKiaHuov2c6mw6uCXWikV9kOIP4=
k8s.io/cloud-provider v0.0.0-20240221210127-14a6b79597e0 h1:vpFk+cvOjZv8HSSpwNFsaUUHISuxxkLU3NIRs9Q+uLk= k8s.io/cloud-provider v0.0.0-20240222010000-7a7cd07d276e h1:8Zc/YjcmTp3UvtQEwEbk1C53jh/1F7rxs2bkGYZUCUg=
k8s.io/cloud-provider v0.0.0-20240221210127-14a6b79597e0/go.mod h1:G34oK5aUOKxih5L6WgKz1jI0TiwELWampsj50JMOPYc= k8s.io/cloud-provider v0.0.0-20240222010000-7a7cd07d276e/go.mod h1:G34oK5aUOKxih5L6WgKz1jI0TiwELWampsj50JMOPYc=
k8s.io/component-base v0.0.0-20240221203243-4876638a4138 h1:kgY7847GvBQXkWaemXtGtfVG5UhYX/f3B5Ghb+wO2QM= k8s.io/component-base v0.0.0-20240221203243-4876638a4138 h1:kgY7847GvBQXkWaemXtGtfVG5UhYX/f3B5Ghb+wO2QM=
k8s.io/component-base v0.0.0-20240221203243-4876638a4138/go.mod h1:Bf74PikueyXc4hduq9Fk6HNHav/OCym3S0shcPoh/mA= k8s.io/component-base v0.0.0-20240221203243-4876638a4138/go.mod h1:Bf74PikueyXc4hduq9Fk6HNHav/OCym3S0shcPoh/mA=
k8s.io/controller-manager v0.0.0-20240221205959-08cdda213210 h1:l5PhR+sojs9e+f/bjxZsSwVxRuJ03tNGyusnsEgLP+A= k8s.io/controller-manager v0.0.0-20240221205959-08cdda213210 h1:l5PhR+sojs9e+f/bjxZsSwVxRuJ03tNGyusnsEgLP+A=