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.

Merge pull request #44569 from yujuhong/fix-rkt
d3d69505 · Kubernetes Submit Queue · GitHub · 4372b437 · 1d3d12df · d3d69505
Commit d3d69505 authored Apr 17, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 17, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

kubelet.go pkg/kubelet/kubelet.go +1 -1

No files found.
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -2059,7 +2059,7 @@ func (kl *Kubelet) updateRuntimeUp() {
 	}
 	// Only check specific conditions when runtime integration type is cri,
 	// 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 {
 			glog.Errorf("Container runtime status is nil")
 			return