github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41460 from yujuhong/fix_kubemark

Browse Source 
Disable CRI in hollow-node
This commit is contained in:
Wojciech Tyczynski 2017-02-15 08:28:32 +01:00 committed by GitHub
commit 65cfd86c89
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubemark/hollow_kubelet.go
View File

@ -160,6 +160,8 @@ func GetHollowKubeletConfig(
c.SerializeImagePulls = true
c.SystemCgroups = ""
c.ProtectKernelDefaults = false
// TODO: This is a temporary workaround until we fix CRI+kubemark properly.
c.EnableCRI = false
// TODO(mtaufen): Note that PodInfraContainerImage was being set to the empty value before,
// but this may not have been intentional. (previous code (SimpleKubelet)