mirror of https://github.com/k3s-io/k3s
8013bdb180
Automatic merge from submit-queue (batch tested with PRs 64749, 64797). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix standalone dockershim. Ref https://github.com/kubernetes-incubator/cri-tools/pull/320#issuecomment-394554484. This PR fixes a bug that standalone dockershim exits immediately. This PR: 1) Changes standalone dockershim to wait on `stopCh`, so that it won't exit immediately. 2) Removes `stopCh` from dockershim internal. It doesn't help much for graceful stop, because kubelet will exit immediately anyway. https://github.com/kubernetes/kubernetes/blob/master/cmd/kubelet/app/server.go#L748 @kubernetes/sig-node-pr-reviews @yujuhong @feiskyer **Release note**: ```release-note none ``` |
||
|---|---|---|
| .. | ||
| app | ||
| BUILD | ||
| OWNERS | ||
| kubelet.go | ||