github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 05:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21278 from pweil-/include-discovery

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-22 09:31:53 -08:00
parent 95354490c1 6cf26a41c0
commit 9b9b4fee11
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/client/clientset_generated/internalclientset/clientset_adaption.go
View File

@@ -38,5 +38,11 @@ func FromUnversionedClient(c *unversioned.Client) *Clientset {
clientset.ExtensionsClient = unversionedextensions.New(nil)
}
if c != nil && c.DiscoveryClient != nil {
clientset.DiscoveryClient = unversioned.NewDiscoveryClient(c.DiscoveryClient.RESTClient)
} else {
clientset.DiscoveryClient = unversioned.NewDiscoveryClient(nil)
}
return &clientset
}

6
pkg/client/clientset_generated/release_1_2/clientset_adaption.go
View File

@@ -38,5 +38,11 @@ func FromUnversionedClient(c *unversioned.Client) *Clientset {
clientset.ExtensionsClient = v1beta1extensions.New(nil)
}
if c != nil && c.DiscoveryClient != nil {
clientset.DiscoveryClient = unversioned.NewDiscoveryClient(c.DiscoveryClient.RESTClient)
} else {
clientset.DiscoveryClient = unversioned.NewDiscoveryClient(nil)
}
return &clientset
}