Merge pull request #77947 from tallclair/automated-cherry-pick-of-#77888-upstream-release-1.14

Automated cherrypick of #77888 upstream release 1.14

Merge pull request #77947 from tallclair/automated-cherry-pick-of-#77888-upstream-release-1.14
4efb32be · Kubernetes Prow Robot · GitHub · 92e692de · 1503be45 · 4efb32be
Unverified Commit 4efb32be authored May 21, 2019 by Kubernetes Prow Robot Committed by GitHub May 21, 2019
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
@@ -656,7 +656,7 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
 	}
 	klet.runtimeService = runtimeService

-	if utilfeature.DefaultFeatureGate.Enabled(features.RuntimeClass) {
+	if utilfeature.DefaultFeatureGate.Enabled(features.RuntimeClass) && kubeDeps.KubeClient != nil {
 		klet.runtimeClassManager = runtimeclass.NewManager(kubeDeps.KubeClient)
 	}