Merge pull request kubernetes#77888 from tallclair/standalone

k8s-ci-robot · web-flow · commit adf6fa69877a · 2019-05-15T00:04:48.000-07:00
Don't create a RuntimeClassManager without a KubeClient
diff --git 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)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -656,7 +656,7 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,`
`656`	`656`	`}`
`657`	`657`	`klet.runtimeService = runtimeService`
`658`	`658`
`659`		`- if utilfeature.DefaultFeatureGate.Enabled(features.RuntimeClass) {`
	`659`	`+ if utilfeature.DefaultFeatureGate.Enabled(features.RuntimeClass) && kubeDeps.KubeClient != nil {`
`660`	`660`	`klet.runtimeClassManager = runtimeclass.NewManager(kubeDeps.KubeClient)`
`661`	`661`	`}`
`662`	`662`