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