Merge pull request #43494 from guangxuli/fix_k8s_kubelet_panix

Automatic merge from submit-queue (batch tested with PRs 49238, 49595, 43494, 47897, 48905) Should not set struct pointer directly to interface which may cause potential panic fix https://github.com/kubernetes/kubernetes/issues/43127 to avoid potential kubelet panic. In our old implemention, interface `kubeDeps.EventClient ` (interface) will never equals to `nil` even if `eventClient `(struct pointer )was set to `nil`. `kubeDeps.ExternalKubeClient` and `kubeDeps.KubeClient` also have same potential risk.

Merge pull request #43494 from guangxuli/fix_k8s_kubelet_panix
b3db5a20 · Kubernetes Submit Queue · GitHub · b751bdbd · d6e051ec · b3db5a20
Commit b3db5a20 authored Jul 28, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

server.go cmd/kubelet/app/server.go +4 -1

No files found.
--- a/cmd/kubelet/app/server.go
+++ b/cmd/kubelet/app/server.go
@@ -157,6 +157,7 @@ func UnsecuredDependencies(s *options.KubeletServer) (*kubelet.Dependencies, err
 		DockerClient:       dockerClient,
 		KubeClient:         nil,
 		ExternalKubeClient: nil,
+		EventClient:        nil,
 		Mounter:            mounter,
 		NetworkPlugins:     ProbeNetworkPlugins(s.NetworkPluginDir, s.CNIConfDir, s.CNIBinDir),
 		OOMAdjuster:        oom.NewOOMAdjuster(),
@@ -513,7 +514,9 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies) (err error) {

 		kubeDeps.KubeClient = kubeClient
 		kubeDeps.ExternalKubeClient = externalKubeClient
-		kubeDeps.EventClient = eventClient
+		if eventClient != nil {
+			kubeDeps.EventClient = eventClient
+		}
 	}

 	if kubeDeps.Auth == nil {