Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

cherry-pick fixes commits for Stable 1.5 #1728

Closed
wants to merge 3 commits into from
Closed

cherry-pick fixes commits for Stable 1.5 #1728

wants to merge 3 commits into from

Commits on May 23, 2019

  1. shimv2: kill a container return directly once the container termianted 

    According to CRI specs, kubelet will call StopPodSandbox()
at least once before calling RemovePodSandbox, and this call
is idempotent, and must not return an error if all relevant
resources have already been reclaimed. And in that call it will
send a SIGKILL signal first to try to stop the container, thus
once the container has terminated, here should ignore this signal
and return directly.

Fixes:kata-containers#1672

Signed-off-by: lifupan <[email protected]>
    @lifupan
    lifupan committed May 23, 2019
    Configuration menu
    Copy the full SHA
    f5c3fff View commit details
    Browse the repository at this point in the history

  2. shimv2: shutdown the sandbox when sandbox container exited 

    Kubelet would cleanup the pod cgroup resources and kill the processes
in the pod cgroups when it detected all of the containers in a pod exited,
thus shimv2 should close the hypervisor process once the podsandbox container
exited, otherwise, the hypervisor process would be killed by kubelet and
made shimv2 failed to shutdown the sandbox.

Fixes:kata-containers#1672

Signed-off-by: lifupan <[email protected]>
    @lifupan
    lifupan committed May 23, 2019
    Configuration menu
    Copy the full SHA
    8dc4ff6 View commit details
    Browse the repository at this point in the history

  3. shimv2: create the rootfs dir if it doesn't exist 

    Latest containerd commit<c0f0b21314b93a1> had moved the
step of creating rootfs dir from creating bundle to container
creation; in order to support both of the old and latest
containerd, check the "rootfs" existed before creating it.

Fixes:kata-containers#1652

Signed-off-by: Fuapn Li <[email protected]>
    @lifupan
    lifupan committed May 23, 2019
    Configuration menu
    Copy the full SHA
    de95a1f View commit details
    Browse the repository at this point in the history