merge with master

This commit is contained in:
Murat Kabilov
2017-07-24 21:42:57 +02:00
parent 035069137a
commit b2a882f9fd
7 changed files with 11 additions and 11 deletions
+2
View File
@@ -28,6 +28,7 @@ type KubernetesClient struct {
v1core.ConfigMapsGetter
v1beta1.StatefulSetsGetter
extensions.ThirdPartyResourcesGetter
RESTClient rest.Interface
}
func NewFromKubernetesInterface(src kubernetes.Interface) (c KubernetesClient) {
@@ -41,6 +42,7 @@ func NewFromKubernetesInterface(src kubernetes.Interface) (c KubernetesClient) {
c.PersistentVolumesGetter = src.CoreV1()
c.StatefulSetsGetter = src.AppsV1beta1()
c.ThirdPartyResourcesGetter = src.ExtensionsV1beta1()
c.RESTClient = src.CoreV1().RESTClient()
return
}