github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Remove deprecated and experimental fields from KubeletConfiguration"

Browse Source
This commit is contained in:
Shyam JVS
2017-09-02 16:30:56 +02:00
committed by GitHub
parent 9934d12cad
commit 3bba914496
16 changed files with 340 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubelet/kubelet.go
View File

@@ -97,7 +97,7 @@ func main() {
// start the experimental docker shim, if enabled
if kubeletFlags.ExperimentalDockershim {
if err := app.RunDockershim(kubeletFlags, kubeletConfig); err != nil {
if err := app.RunDockershim(kubeletConfig, &kubeletFlags.ContainerRuntimeOptions); err != nil {
die(err)
}
}