Merge pull request #18636 from sjenning/picks-volume-manager

Automatic merge from submit-queue. Picks for volume manager Thanks to @jsafrane for these fixes kubernetes/kubernetes#59873 kubernetes/kubernetes#59923 59923 modified from upstream because some logging levels where already higher in 1.9 xref https://bugzilla.redhat.com/show_bug.cgi?id=1538216 Fixes #17605 Fixes #17556 @derekwaynecarr
openshift · Feb 16, 2018 · e4f2115 · e4f2115
2 parents ddb6d36 + a2ec6c9
commit e4f2115
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 16 deletions.
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
diff --git a/...o/kubernetes/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator_test.go b/...o/kubernetes/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/reconciler/reconciler.go b/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/reconciler/reconciler.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/volume_manager.go b/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/volume_manager.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/operation_executor.go b/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/operation_executor.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/operation_generator.go b/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/operation_generator.go