Merge pull request #23510 from caesarxuchao/move-fake-discovery

cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go

@@ -73,6 +73,7 @@ func (g *genClientset) Imports(c *generator.Context) (imports []string) {
 		"k8s.io/kubernetes/pkg/apimachinery/registered",
 		"k8s.io/kubernetes/pkg/client/testing/core",
 		"k8s.io/kubernetes/pkg/client/typed/discovery",
+		"fakediscovery \"k8s.io/kubernetes/pkg/client/typed/discovery/fake\"",
 		"k8s.io/kubernetes/pkg/runtime",
 		"k8s.io/kubernetes/pkg/watch",
 	)
@@ -134,7 +135,7 @@ type Clientset struct {
 }
 
 func (c *Clientset) Discovery() discovery.DiscoveryInterface {
-	return &FakeDiscovery{&c.Fake}
+	return &fakediscovery.FakeDiscovery{&c.Fake}
 }
 `
 

pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go

@@ -24,6 +24,7 @@ import (
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/client/testing/core"
 	"k8s.io/kubernetes/pkg/client/typed/discovery"
+	fakediscovery "k8s.io/kubernetes/pkg/client/typed/discovery/fake"
 	unversionedcore "k8s.io/kubernetes/pkg/client/typed/generated/core/unversioned"
 	fakeunversionedcore "k8s.io/kubernetes/pkg/client/typed/generated/core/unversioned/fake"
 	unversionedextensions "k8s.io/kubernetes/pkg/client/typed/generated/extensions/unversioned"
@@ -57,7 +58,7 @@ type Clientset struct {
 }
 
 func (c *Clientset) Discovery() discovery.DiscoveryInterface {
-	return &FakeDiscovery{&c.Fake}
+	return &fakediscovery.FakeDiscovery{&c.Fake}
 }
 
 var _ clientset.Interface = &Clientset{}

pkg/client/clientset_generated/release_1_2/clientset.go

@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// This file is generated by client-gen with arguments: --clientset-name=release_1_2 --clientset-only=true --input=[api/v1,extensions/v1beta1]
+
 package release_1_2
 
 import (

pkg/client/clientset_generated/release_1_2/fake/clientset_generated.go

@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// This file is generated by client-gen with arguments: --clientset-name=release_1_2 --clientset-only=true --input=[api/v1,extensions/v1beta1]
+
 package fake
 
 import (
@@ -22,6 +24,7 @@ import (
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2"
 	"k8s.io/kubernetes/pkg/client/testing/core"
 	"k8s.io/kubernetes/pkg/client/typed/discovery"
+	fakediscovery "k8s.io/kubernetes/pkg/client/typed/discovery/fake"
 	v1core "k8s.io/kubernetes/pkg/client/typed/generated/core/v1"
 	fakev1core "k8s.io/kubernetes/pkg/client/typed/generated/core/v1/fake"
 	v1beta1extensions "k8s.io/kubernetes/pkg/client/typed/generated/extensions/v1beta1"
@@ -55,7 +58,7 @@ type Clientset struct {
 }
 
 func (c *Clientset) Discovery() discovery.DiscoveryInterface {
-	return &FakeDiscovery{&c.Fake}
+	return &fakediscovery.FakeDiscovery{&c.Fake}
 }
 
 var _ clientset.Interface = &Clientset{}

pkg/client/clientset_generated/release_1_2/fake/discovery.go

-/*
-Copyright 2016 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// TODO: the fake discovery client should live in pkg/client/discovery/, rather
-// than being copied in every fake clientset.
-package fake
-
-import (
-	"github.com/emicklei/go-restful/swagger"
-	"k8s.io/kubernetes/pkg/api/unversioned"
-	"k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/client/testing/core"
-	"k8s.io/kubernetes/pkg/version"
-)
-
-type FakeDiscovery struct {
-	*core.Fake
-}
-
-func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*unversioned.APIResourceList, error) {
-	action := core.ActionImpl{
-		Verb:     "get",
-		Resource: "resource",
-	}
-	c.Invokes(action, nil)
-	return c.Resources[groupVersion], nil
-}
-
-func (c *FakeDiscovery) ServerResources() (map[string]*unversioned.APIResourceList, error) {
-	action := core.ActionImpl{
-		Verb:     "get",
-		Resource: "resource",
-	}
-	c.Invokes(action, nil)
-	return c.Resources, nil
-}
-
-func (c *FakeDiscovery) ServerGroups() (*unversioned.APIGroupList, error) {
-	return nil, nil
-}
-
-func (c *FakeDiscovery) ServerVersion() (*version.Info, error) {
-	action := core.ActionImpl{}
-	action.Verb = "get"
-	action.Resource = "version"
-
-	c.Invokes(action, nil)
-	versionInfo := version.Get()
-	return &versionInfo, nil
-}
-
-func (c *FakeDiscovery) SwaggerSchema(version unversioned.GroupVersion) (*swagger.ApiDeclaration, error) {
-	action := core.ActionImpl{}
-	action.Verb = "get"
-	if version == v1.SchemeGroupVersion {
-		action.Resource = "/swaggerapi/api/" + version.Version
-	} else {
-		action.Resource = "/swaggerapi/apis/" + version.Group + "/" + version.Version
-	}
-
-	c.Invokes(action, nil)
-	return &swagger.ApiDeclaration{}, nil
-}

pkg/client/clientset_generated/internalclientset/fake/discovery.go → pkg/client/typed/discovery/fake/discovery.go

@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// TODO: the fake discovery client should live in pkg/client/discovery/, rather
-// than being copied in every fake clientset.
 package fake
 
 import (