From bc8249cc6f35fabffff5ccf4e13978ff9a6a2e32 Mon Sep 17 00:00:00 2001
From: David Eads <deads@redhat.com>
Date: Thu, 24 Aug 2017 11:07:57 -0400
Subject: [PATCH] UPSTREAM: <carry>: allow PV controller recycler template
 override

---
 vendor/k8s.io/kubernetes/pkg/volume/patch.go   | 7 +++++++
 vendor/k8s.io/kubernetes/pkg/volume/plugins.go | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 vendor/k8s.io/kubernetes/pkg/volume/patch.go

diff --git a/vendor/k8s.io/kubernetes/pkg/volume/patch.go b/vendor/k8s.io/kubernetes/pkg/volume/patch.go
new file mode 100644
index 000000000000..b9fffad6657a
--- /dev/null
+++ b/vendor/k8s.io/kubernetes/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
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/plugins.go b/vendor/k8s.io/kubernetes/pkg/volume/plugins.go
index 41721d1eeaf0..4d13a74cf5dd 100644
--- a/vendor/k8s.io/kubernetes/pkg/volume/plugins.go
+++ b/vendor/k8s.io/kubernetes/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{