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 #42814 from yujuhong/cri-kubemark-3rd-time-is-the-charm

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 42734, 42745, 42758, 42814, 42694)

kubemark: enable CRI in the hollow kubelet
This commit is contained in:
Kubernetes Submit Queue 2017-03-09 15:06:58 -08:00 committed by GitHub
commit 5a47671614
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubemark/hollow_kubelet.go
View File

@ -159,8 +159,6 @@ 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)