Merge pull request openshift#12245 from gnufied/exp-backoff-on-delete-34

Merged by openshift-bot
hodovska · Dec 14, 2016 · b1155c8 · b1155c8
2 parents 56b3d93 + e231fb7
commit b1155c8
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 20 deletions.
diff --git a/pkg/cmd/server/kubernetes/master.go b/pkg/cmd/server/kubernetes/master.go
@@ -192,6 +192,7 @@ func (c *MasterConfig) RunPersistentVolumeController(client *client.Client, name
 		nil, nil, nil,
 		nil, // event recorder
 		s.VolumeConfiguration.EnableDynamicProvisioning,
+		true, // enableExpBackoff
 	)
 	volumeController.Run(utilwait.NeverStop)
 }

diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/framework_test.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/framework_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/pv_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/pv_controller.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/pv_controller_base.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/pv_controller_base.go
diff --git a/vendor/k8s.io/kubernetes/test/integration/persistentvolumes/persistent_volumes_test.go b/vendor/k8s.io/kubernetes/test/integration/persistentvolumes/persistent_volumes_test.go