UPSTREAM: <carry>: allow PV controller recycler template override

:000000 100644 0000000000... b9fffad... A	pkg/volume/patch.go
:100644 100644 41721d1... 4d13a74... M	pkg/volume/plugins.go

Author: deads2k

pkg/volume/patch.go

@@ -0,0 +1,7 @@
+package volume
+
+import "k8s.io/kubernetes/pkg/api/v1"
+
+// we carry a patch which allows us to reset this function selectively when we run openshift start, but *not*
+// when we run `kube-controller-manager`.  We have it in this separate file to avoid conflicts during a rebase
+var NewPersistentVolumeRecyclerPodTemplate func() *v1.Pod = newPersistentVolumeRecyclerPodTemplate

pkg/volume/plugins.go

@@ -552,7 +552,7 @@ func (pm *VolumePluginMgr) FindAttachablePluginByName(name string) (AttachableVo
 //     before failing.  Recommended.  Default is 60 seconds.
 //
 // See HostPath and NFS for working recycler examples
-func NewPersistentVolumeRecyclerPodTemplate() *v1.Pod {
+func newPersistentVolumeRecyclerPodTemplate() *v1.Pod {
 	timeout := int64(60)
 	pod := &v1.Pod{
 		ObjectMeta: metav1.ObjectMeta{