Skip to content

Commit d1e9479

Browse files
openshift-merge-robotopenshift-merge-robot
authored
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.
2 parents 7ed6862 + 69074b8 commit d1e9479

File tree

4 files changed

+8
-33
lines changed

4 files changed

+8
-33
lines changed

‎vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/BUILD

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_checkpoint.go

+6-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_sandbox.go

+1-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_service.go

+1-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)