Skip to content

K
k3s
Commit 5a476716 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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
parents 4540674b 9878c188
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
pkg/kubemark/hollow_kubelet.go
View file @ 5a476716
...@@ -159,8 +159,6 @@ func GetHollowKubeletConfig( ...@@ -159,8 +159,6 @@ 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