Merge pull request #17299 from sjenning/pick-55641

Automatic merge from submit-queue (batch tested with PRs 17299, 17482, 17471). UPSTREAM: 55641: dockershim: remove corrupt checkpoints immediately upon detection 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
openshift · Nov 28, 2017 · d15f4cc · d15f4cc
2 parents 58c9ab7 + 7c46f7a
commit d15f4cc
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 39 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/checkpoint_store.go b/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/checkpoint_store.go
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
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/testing/util.go b/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/testing/util.go