Skip to content

K
k3s
Commit 5e7972f4 authored by Yu-Ju Hong's avatar Yu-Ju Hong
Browse files
Options

Disable CRI in hollow-node

Some parts of the new dockershim are not properly mocked out in the hollow-node. Disabling CRI in the hollow node until a proper fix is put in.
parent a197fbdf
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
pkg/kubemark/hollow_kubelet.go
View file @ 5e7972f4
...@@ -160,6 +160,8 @@ func GetHollowKubeletConfig( ...@@ -160,6 +160,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