mirror of https://github.com/k3s-io/k3s
Merge pull request #54508 from ivan4th/fix-hyperkube-kubelet-dockershim
Automatic merge from submit-queue (batch tested with PRs 54438, 54508). 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 hyperkube kubelet --experimental-dockershim **What this PR does / why we need it**: This makes hyperkube kubelet command support `--experimental-dockershim` flag. **Which issue this PR fixes** fixes #54424 **Release note**: ```release-note Fix hyperkube kubelet --experimental-dockershim ```pull/6/head
commit
f4fb38a25d
|
@ -39,6 +39,9 @@ func NewKubelet() (*Server, error) {
|
|||
configuration data, with the running set of containers by starting or stopping
|
||||
Docker containers.`,
|
||||
Run: func(_ *Server, _ []string, stopCh <-chan struct{}) error {
|
||||
if s.ExperimentalDockershim {
|
||||
return app.RunDockershim(&s.KubeletFlags, &s.KubeletConfiguration)
|
||||
}
|
||||
return app.Run(s, nil)
|
||||
},
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue