github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #30559 from mwielgus/informer-quick-fix

Browse Source 
Automatic merge from submit-queue

Fix in default client factory in federated informer

This wasn't catched by junit tests because we mock the factory.
This commit is contained in:
Kubernetes Submit Queue 2016-08-12 18:38:48 -07:00 committed by GitHub
commit b7ccc15b0a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
federation/pkg/federation-controller/util/federated_informer.go
View File

@ -122,7 +122,7 @@ func NewFederatedInformer(
targetInformerFactory: targetInformerFactory, targetInformerFactory: targetInformerFactory,
clientFactory: func(cluster *federation_api.Cluster) (federation_release_1_4.Interface, error) { clientFactory: func(cluster *federation_api.Cluster) (federation_release_1_4.Interface, error) {
clusterConfig, err := BuildClusterConfig(cluster) clusterConfig, err := BuildClusterConfig(cluster)
if err != nil && clusterConfig != nil { if err == nil && clusterConfig != nil {
clientset := federation_release_1_4.NewForConfigOrDie(restclient.AddUserAgent(clusterConfig, userAgentName)) clientset := federation_release_1_4.NewForConfigOrDie(restclient.AddUserAgent(clusterConfig, userAgentName))
return clientset, nil return clientset, nil
} }