Skip to content

Commit d15f4cc

Browse files
openshift-merge-robotopenshift-merge-robot
authored
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
2 parents 58c9ab7 + 7c46f7a commit d15f4cc

File tree

6 files changed

+11
-39
lines changed

6 files changed

+11
-39
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/checkpoint_store.go

+1-3
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.

‎vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/testing/util.go

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

0 commit comments

Comments
 (0)