Merge pull request #49366 from gmarek/coreEvents

Automatic merge from submit-queue Explicitly use Core() client when creating eventClint @sttts

Merge pull request #49366 from gmarek/coreEvents
40249c06 · Kubernetes Submit Queue · GitHub · 3d94338e · 45b47c7f · 40249c06
Commit 40249c06 authored Jul 21, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

server.go cmd/kube-proxy/app/server.go +1 -1

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

No files found.
--- a/cmd/kube-proxy/app/server.go
+++ b/cmd/kube-proxy/app/server.go
@@ -413,7 +413,7 @@ func createClients(config componentconfig.ClientConnectionConfiguration, masterO
 		return nil, nil, err
 	}

-	return client, eventClient, nil
+	return client, eventClient.Core(), nil
 }

 // NewProxyServer returns a new ProxyServer.

--- a/cmd/kubelet/app/server.go
+++ b/cmd/kubelet/app/server.go
@@ -485,10 +485,12 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies) (err error) {
 			eventClientConfig := *clientConfig
 			eventClientConfig.QPS = float32(s.EventRecordQPS)
 			eventClientConfig.Burst = int(s.EventBurst)
-			eventClient, err = clientgoclientset.NewForConfig(&eventClientConfig)
+			tmpClient, err := clientgoclientset.NewForConfig(&eventClientConfig)
 			if err != nil {
-				glog.Warningf("Failed to create API Server client: %v", err)
+				glog.Warningf("Failed to create API Server client for Events: %v", err)
 			}
+			eventClient = tmpClient.Core()
+
 		} else {
 			switch {
 			case s.RequireKubeConfig: