Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/0.8] shim: Clean up delete invocation behavior #1042

Merged
merged 1 commit into from
Jun 1, 2021

Commits on May 28, 2021

  1. shim: Clean up delete invocation behavior

    This changes the behavior when the shim is invoked with the "delete"
    command line argument.
    
    Previously, the delete path did two things it should not:
    - Attempted to locate the sandbox container for the pod and delete it as
      well. This meant if "shim delete" was invoked for a workload
      container, it could bring down the whole pod. The only reason we did
      not see this in the past is that prior to containerd 1.5 "shim delete"
      was not called for successful container stop operations.
    
    - Deleted the bundle directory. We shouldn't do this in the shim, as
      containerd does it itself.
    
    For reference on what the Linux shim does, see here: https://github.com/containerd/containerd/blob/master/runtime/v2/runc/v2/service.go#L291
    
    Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
    (cherry picked from commit 450cdb1)
    Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
    kevpar committed May 28, 2021
    Configuration menu
    Copy the full SHA
    c2840dd View commit details
    Browse the repository at this point in the history