Merge pull request #16384 from gnufied/fix-detach-delay

Automatic merge from submit-queue (batch tested with PRs 16384, 16327, 16199, 16286, 16378) Always populate volume status from node Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1481729 Actual Upstream PR - kubernetes/kubernetes#52221 But we think, we won't be able to get this in 1.8
openshift · Sep 16, 2017 · 6edb23d · 6edb23d
2 parents 9df7ae1 + 263a57e
commit 6edb23d
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 29 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/attach_detach_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/attach_detach_controller.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache/actual_state_of_world.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache/actual_state_of_world.go
diff --git a/.../k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache/actual_state_of_world_test.go b/.../k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache/actual_state_of_world_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/reconciler/reconciler_test.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/reconciler/reconciler_test.go