Skip to content

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

Merge pull request #44569 from yujuhong/fix-rkt

Automatic merge from submit-queue Don't check runtime condition for rktnetes rktnetes is not a CRI implementation, and does not provide runtime conditions. This change fixes the issue where rkt will never be considered running from kubelet's point of view.
parents 4372b437 1d3d12df
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/kubelet/kubelet.go
View file @ d3d69505
...@@ -2059,7 +2059,7 @@ func (kl *Kubelet) updateRuntimeUp() { ...@@ -2059,7 +2059,7 @@ func (kl *Kubelet) updateRuntimeUp() {
} }
// Only check specific conditions when runtime integration type is cri, // Only check specific conditions when runtime integration type is cri,
// because the old integration doesn't populate any runtime condition. // because the old integration doesn't populate any runtime condition.
if kl.kubeletConfiguration.EnableCRI { if kl.kubeletConfiguration.EnableCRI && kl.kubeletConfiguration.ContainerRuntime != "rkt" {
if s == nil { if s == nil {
glog.Errorf("Container runtime status is nil") glog.Errorf("Container runtime status is nil")
return return
......
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