Merge pull request #18554 from rootfs/pr-58177

Automatic merge from submit-queue (batch tested with PRs 17866, 18518, 18554, 18534, 17759). UPSTREAM: 58177: Redesign and implement volume reconstruction work fix https://bugzilla.redhat.com/show_bug.cgi?id=1508578 Note, e2e test is not ported, because the dependency on kubernetes #56593 @childsb @gnufied @jsafrane
openshift · Feb 12, 2018 · 8fd1640 · 8fd1640
2 parents 3522daf + 8d3fd8e
commit 8fd1640
Show file tree

Hide file tree

Showing 11 changed files with 301 additions and 182 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/config/config.go b/vendor/k8s.io/kubernetes/pkg/kubelet/config/config.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/cache/actual_state_of_world.go b/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/cache/actual_state_of_world.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/cache/actual_state_of_world_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/cache/actual_state_of_world_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/cache/desired_state_of_world.go b/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/cache/desired_state_of_world.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/cache/desired_state_of_world_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/cache/desired_state_of_world_test.go
diff --git a/...k8s.io/kubernetes/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go b/...k8s.io/kubernetes/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go