mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #42814 from yujuhong/cri-kubemark-3rd-time-is-the-charm
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:
commit
5a47671614
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user