kubelet: skip initializing/using the RuntimeClass in standalone mode

In standalone mode, kubelet will not be configured to talk to an apiserver. The RuntimeClass manager should be disabled in this case.

kubelet: skip initializing/using the RuntimeClass in standalone mode
a1f7ae7a · Yu-Ju Hong · 7bfd0d35 · a1f7ae7a · a1f7ae7a
Commit a1f7ae7a authored Sep 11, 2018 by Yu-Ju Hong
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

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

No files found.
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -657,7 +657,7 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
 	}
 	klet.runtimeService = runtimeService

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


--- a/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go
+++ b/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go
@@ -51,7 +51,7 @@ func (m *kubeGenericRuntimeManager) createPodSandbox(pod *v1.Pod, attempt uint32
 	}

 	runtimeHandler := ""
-	if utilfeature.DefaultFeatureGate.Enabled(features.RuntimeClass) {
+	if utilfeature.DefaultFeatureGate.Enabled(features.RuntimeClass) && m.runtimeClassManager != nil {
 		runtimeHandler, err = m.runtimeClassManager.LookupRuntimeHandler(pod.Spec.RuntimeClassName)
 		if err != nil {
 			message := fmt.Sprintf("CreatePodSandbox for pod %q failed: %v", format.Pod(pod), err)