mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
Merge pull request #42712 from yujuhong/revert_again
Revert "kubemark: enable CRI for the hollow nodes"
This commit is contained in:
commit
c3d7ee11d1
@ -159,6 +159,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)
|
||||
|
Loading…
Reference in New Issue
Block a user