Merge pull request #17302 from sjenning/pick-55641-3.7

Automatic merge from submit-queue. UPSTREAM: 55641: dockershim: remove corrupt checkpoints immediately upon detection [3.7] master PR #17299 kubernetes/kubernetes#55641 xref https://bugzilla.redhat.com/show_bug.cgi?id=1512717 @derekwaynecarr @eparis @jupierce Diverges from upstream in `checkpoint_store.go`, since that file no longer exists upstream. The checkpoint code was migrated to pkg/kubelet/util in kubernetes/kubernetes#54085. Also, I don't remove the `dockershim/errors` package as was done in upstream because the `checkpoint_store.go` uses it. This reduces the footprint of the change.
openshift · Nov 30, 2017 · d1e9479 · d1e9479
2 parents 7ed6862 + 69074b8
commit d1e9479
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 33 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/BUILD b/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/BUILD
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_checkpoint.go b/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_checkpoint.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_sandbox.go b/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_sandbox.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_service.go b/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_service.go