github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #49366 from gmarek/coreEvents

Browse Source 
Automatic merge from submit-queue

Explicitly use Core() client when creating eventClint

@sttts
This commit is contained in:
Kubernetes Submit Queue 2017-07-21 04:20:38 -07:00 committed by GitHub
commit 40249c061f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-proxy/app/server.go
View File

@ -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.

6
cmd/kubelet/app/server.go
View File

@ -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: