Skip to content

K
k3s
Commit c3d7ee11 authored by Wojciech Tyczynski's avatar Wojciech Tyczynski Committed by GitHub
Browse files
Options

Merge pull request #42712 from yujuhong/revert_again

Revert "kubemark: enable CRI for the hollow nodes"
parents 4121fd99 6578d5e8
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
pkg/kubemark/hollow_kubelet.go
View file @ c3d7ee11
...@@ -159,6 +159,8 @@ func GetHollowKubeletConfig( ...@@ -159,6 +159,8 @@ func GetHollowKubeletConfig(
c.SerializeImagePulls = true c.SerializeImagePulls = true
c.SystemCgroups = "" c.SystemCgroups = ""
c.ProtectKernelDefaults = false 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, // TODO(mtaufen): Note that PodInfraContainerImage was being set to the empty value before,
// but this may not have been intentional. (previous code (SimpleKubelet) // but this may not have been intentional. (previous code (SimpleKubelet)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment