github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #54508 from ivan4th/fix-hyperkube-kubelet-dockershim

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue
2017-10-24 18:09:04 -07:00
committed by GitHub
parent 33e4f178f2 ea5f58c77c
commit f4fb38a25d
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/hyperkube/kubelet.go
View File

@@ -39,6 +39,9 @@ func NewKubelet() (*Server, error) {
configuration data, with the running set of containers by starting or stopping configuration data, with the running set of containers by starting or stopping
Docker containers.`, Docker containers.`,
Run: func(_ *Server, _ []string, stopCh <-chan struct{}) error { Run: func(_ *Server, _ []string, stopCh <-chan struct{}) error {
if s.ExperimentalDockershim {
return app.RunDockershim(&s.KubeletFlags, &s.KubeletConfiguration)
}
return app.Run(s, nil) return app.Run(s, nil)
}, },
} }