Merge pull request #16965 from jsafrane/3.7-master-fix-pvcontroller-sync

Automatic merge from submit-queue (batch tested with PRs 16667, 16796, 16960, 16965, 16894). [master] UPSTREAM: 49016: PV controller: resync informers manually Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1501152 This is the same as #16927, just for master instead of stage. /assign @deads2k
openshift · Oct 20, 2017 · 867982b · 867982b
2 parents c61d1bb + a739d74
commit 867982b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 6 deletions.
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/pkg/controller/volume/persistentvolume/pv_controller_test.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/pv_controller_test.go