Merge pull request #18442 from gnufied/backport-event-refactoring

Automatic merge from submit-queue. UPSTREAM: 56872: Fix event generation Also fix error handling in operation hooks. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1540039
openshift · Feb 7, 2018 · c49e64b · c49e64b
2 parents 4957392 + ad89448
commit c49e64b
Show file tree

Hide file tree

Showing 8 changed files with 432 additions and 311 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/volume/util/metrics.go b/vendor/k8s.io/kubernetes/pkg/volume/util/metrics.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/nestedpendingoperations/nestedpendingoperations.go b/vendor/k8s.io/kubernetes/pkg/volume/util/nestedpendingoperations/nestedpendingoperations.go
diff --git a/...k8s.io/kubernetes/pkg/volume/util/nestedpendingoperations/nestedpendingoperations_test.go b/...k8s.io/kubernetes/pkg/volume/util/nestedpendingoperations/nestedpendingoperations_test.go