Merge pull request #45384 from caesarxuchao/copy-metrics-interanl

Automatic merge from submit-queue (batch tested with PRs 45382, 45384, 44781, 45333, 45543) Copy internal types to metrics Supersedes #45306. #45306 removed the internal types and suggested whoever needs the internal types should define their own copy, and use the code-gen tools to generated the conversion functions. Per offline discussion with @DirectXMan12, we wanted to go that direction but it's not clear where to put the internal types yet. Hence, as a temporary solution, we decided copy the referred client-go/pkg/api types into metrics api to avoid the dependency. The commit "remove need of registry from custom_metrics/client.go" is similar to what I did to the fake client in an earlier PR. Let me know if you want to put the commit in another PR.

Merge pull request #45384 from caesarxuchao/copy-metrics-interanl
a48cfe9f · Kubernetes Submit Queue · GitHub · b8186966 · a5fd6b91 · a48cfe9f
Commit a48cfe9f authored May 10, 2017 by Kubernetes Submit Queue Committed by GitHub May 10, 2017
21 changed files
--- a/cmd/kube-controller-manager/app/BUILD
+++ b/cmd/kube-controller-manager/app/BUILD
@@ -109,8 +109,6 @@ go_library(
        "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library",
        "//vendor/k8s.io/client-go/tools/record:go_default_library",
        "//vendor/k8s.io/client-go/util/cert:go_default_library",
-        "//vendor/k8s.io/metrics/pkg/apis/custom_metrics/install:go_default_library",
-        "//vendor/k8s.io/metrics/pkg/apis/metrics/install:go_default_library",
        "//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1:go_default_library",
        "//vendor/k8s.io/metrics/pkg/client/custom_metrics:go_default_library",
    ],

--- a/cmd/kube-controller-manager/app/autoscaling.go
+++ b/cmd/kube-controller-manager/app/autoscaling.go
@@ -26,10 +26,6 @@ import (
 	"k8s.io/kubernetes/pkg/controller/podautoscaler/metrics"
 	resourceclient "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1"
 	"k8s.io/metrics/pkg/client/custom_metrics"
-	// install the APIs so that they're registered with the scheme for the clients
-	_ "k8s.io/metrics/pkg/apis/custom_metrics/install"
-	_ "k8s.io/metrics/pkg/apis/metrics/install"
 )
 func startHPAController(ctx ControllerContext) (bool, error) {

--- a/hack/update-codecgen.sh
+++ b/hack/update-codecgen.sh
@@ -51,6 +51,9 @@ generated_files=($(
        -o -wholename '*/codecgen-*-1234.generated.go' \
      \) -prune \
    \) -name '*.generated.go' | LC_ALL=C sort -r
+  find ./vendor/k8s.io/metrics/ \
+    -name '*.generated.go' | LC_ALL=C sort -r
 ))
 # We only work for deps within this prefix.

--- a/staging/src/k8s.io/client-go/pkg/api/BUILD
+++ b/staging/src/k8s.io/client-go/pkg/api/BUILD
@@ -27,8 +27,7 @@ go_library(
        "//vendor/k8s.io/client-go/pkg/api:__subpackages__",
        "//vendor/k8s.io/client-go/pkg/apis:__subpackages__",
        "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install:__subpackages__",
-        "//vendor/k8s.io/metrics/pkg/apis:__subpackages__",
+        "//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake:__subpackages__",
-        "//vendor/k8s.io/metrics/pkg/client:__subpackages__",
    ],
    deps = [
        "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",

--- a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/BUILD
+++ b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/BUILD
@@ -25,6 +25,5 @@ go_library(
        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/api:go_default_library",
    ],
 )
--- a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/install/BUILD
+++ b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/install/BUILD
@@ -15,7 +15,6 @@ go_library(
        "//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/api:go_default_library",
        "//vendor/k8s.io/metrics/pkg/apis/custom_metrics:go_default_library",
        "//vendor/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1:go_default_library",
    ],

--- a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/install/install.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/install/install.go
@@ -22,15 +22,10 @@ import (
 	"k8s.io/apimachinery/pkg/apimachinery/announced"
 	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/client-go/pkg/api"
 	"k8s.io/metrics/pkg/apis/custom_metrics"
 	"k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1"
 )
-func init() {
-	Install(api.GroupFactoryRegistry, api.Registry, api.Scheme)
-}
 // Install registers the API group and adds types to a scheme
 func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) {
 	if err := announced.NewGroupMetaFactory(

--- a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/types.generated.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/types.generated.go
--- a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/types.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/types.go
@@ -19,7 +19,7 @@ package custom_metrics
 import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/pkg/api"
+	"k8s.io/apimachinery/pkg/types"
 )
 // a list of values for a given metric for some set of objects
@@ -36,7 +36,7 @@ type MetricValue struct {
 	metav1.TypeMeta `json:",inline"`
 	// a reference to the described object
-	DescribedObject api.ObjectReference `json:"describedObject"`
+	DescribedObject ObjectReference `json:"describedObject"`
 	// the name of the metric
 	MetricName string `json:"metricName"`
@@ -57,3 +57,21 @@ type MetricValue struct {
 // allObjects is a wildcard used to select metrics
 // for all objects matching the given label selector
 const AllObjects = "*"
+// NOTE: ObjectReference is copied from k8s.io/kubernetes/pkg/api/types.go. We
+// cannot depend on k8s.io/kubernetes/pkg/api because that creates cyclic
+// dependency between k8s.io/metrics and k8s.io/kubernetes. We cannot depend on
+// k8s.io/client-go/pkg/api because the package is going to be deprecated soon.
+// There is no need to keep it an exact copy. Each repo can define its own
+// internal objects.
+// ObjectReference contains enough information to let you inspect or modify the referred object.
+type ObjectReference struct {
+	Kind            string
+	Namespace       string
+	Name            string
+	UID             types.UID
+	APIVersion      string
+	ResourceVersion string
+	FieldPath       string
+}
--- a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/zz_generated.deepcopy.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/zz_generated.deepcopy.go
@@ -36,6 +36,7 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
 	return scheme.AddGeneratedDeepCopyFuncs(
 		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_custom_metrics_MetricValue, InType: reflect.TypeOf(&MetricValue{})},
 		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_custom_metrics_MetricValueList, InType: reflect.TypeOf(&MetricValueList{})},
+		conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_custom_metrics_ObjectReference, InType: reflect.TypeOf(&ObjectReference{})},
 	)
 }
@@ -74,3 +75,12 @@ func DeepCopy_custom_metrics_MetricValueList(in interface{}, out interface{}, c 
 		return nil
 	}
 }
+func DeepCopy_custom_metrics_ObjectReference(in interface{}, out interface{}, c *conversion.Cloner) error {
+	{
+		in := in.(*ObjectReference)
+		out := out.(*ObjectReference)
+		*out = *in
+		return nil
+	}
+}
--- a/staging/src/k8s.io/metrics/pkg/apis/metrics/BUILD
+++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/BUILD
@@ -12,15 +12,18 @@ go_library(
    srcs = [
        "doc.go",
        "register.go",
+        "types.generated.go",
        "types.go",
        "zz_generated.deepcopy.go",
    ],
    tags = ["automanaged"],
    deps = [
+        "//vendor/github.com/ugorji/go/codec:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/api:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
    ],
 )
--- a/staging/src/k8s.io/metrics/pkg/apis/metrics/install/BUILD
+++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/install/BUILD
@@ -16,7 +16,6 @@ go_library(
        "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/api:go_default_library",
        "//vendor/k8s.io/metrics/pkg/apis/metrics:go_default_library",
        "//vendor/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library",
    ],

--- a/staging/src/k8s.io/metrics/pkg/apis/metrics/install/install.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/install/install.go
@@ -23,15 +23,10 @@ import (
 	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/client-go/pkg/api"
 	"k8s.io/metrics/pkg/apis/metrics"
 	"k8s.io/metrics/pkg/apis/metrics/v1alpha1"
 )
-func init() {
-	Install(api.GroupFactoryRegistry, api.Registry, api.Scheme)
-}
 // Install registers the API group and adds types to a scheme
 func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) {
 	if err := announced.NewGroupMetaFactory(

--- a/staging/src/k8s.io/metrics/pkg/apis/metrics/types.generated.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/types.generated.go
--- a/staging/src/k8s.io/metrics/pkg/apis/metrics/types.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/types.go
@@ -17,8 +17,8 @@ limitations under the License.
 package metrics
 import (
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/pkg/api"
 )
 // +genclient=true
@@ -37,7 +37,7 @@ type NodeMetrics struct {
 	Window    metav1.Duration
 	// The memory usage is the memory working set.
-	Usage api.ResourceList
+	Usage ResourceList
 }
 // NodeMetricsList is a list of NodeMetrics.
@@ -85,5 +85,19 @@ type ContainerMetrics struct {
 	// Container name corresponding to the one from pod.spec.containers.
 	Name string
 	// The memory usage is the memory working set.
-	Usage api.ResourceList
+	Usage ResourceList
 }
+// NOTE: ResourceName and ResourceList are copied from
+// k8s.io/kubernetes/pkg/api/types.go. We cannot depend on
+// k8s.io/kubernetes/pkg/api because that creates cyclic dependency between
+// k8s.io/metrics and k8s.io/kubernetes. We cannot depend on
+// k8s.io/client-go/pkg/api because the package is going to be deprecated soon.
+// There is no need to keep them exact copies. Each repo can define its own
+// internal objects.
+// ResourceList is a set of (resource name, quantity) pairs.
+type ResourceList map[ResourceName]resource.Quantity
+// ResourceName is the name identifying various resources in a ResourceList.
+type ResourceName string
--- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/BUILD
+++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/BUILD
@@ -13,6 +13,7 @@ go_library(
        "doc.go",
        "generated.pb.go",
        "register.go",
+        "types.generated.go",
        "types.go",
        "zz_generated.conversion.go",
        "zz_generated.deepcopy.go",
@@ -21,12 +22,13 @@ go_library(
    deps = [
        "//vendor/github.com/gogo/protobuf/proto:go_default_library",
        "//vendor/github.com/gogo/protobuf/sortkeys:go_default_library",
+        "//vendor/github.com/ugorji/go/codec:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/api:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
        "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library",
        "//vendor/k8s.io/metrics/pkg/apis/metrics:go_default_library",
    ],

--- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/types.generated.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/types.generated.go
--- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/zz_generated.conversion.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/zz_generated.conversion.go
@@ -23,7 +23,6 @@ package v1alpha1
 import (
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
-	api "k8s.io/client-go/pkg/api"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	metrics "k8s.io/metrics/pkg/apis/metrics"
 	unsafe "unsafe"
@@ -52,7 +51,7 @@ func RegisterConversions(scheme *runtime.Scheme) error {
 func autoConvert_v1alpha1_ContainerMetrics_To_metrics_ContainerMetrics(in *ContainerMetrics, out *metrics.ContainerMetrics, s conversion.Scope) error {
 	out.Name = in.Name
-	out.Usage = *(*api.ResourceList)(unsafe.Pointer(&in.Usage))
+	out.Usage = *(*metrics.ResourceList)(unsafe.Pointer(&in.Usage))
 	return nil
 }
@@ -76,7 +75,7 @@ func autoConvert_v1alpha1_NodeMetrics_To_metrics_NodeMetrics(in *NodeMetrics, ou
 	out.ObjectMeta = in.ObjectMeta
 	out.Timestamp = in.Timestamp
 	out.Window = in.Window
-	out.Usage = *(*api.ResourceList)(unsafe.Pointer(&in.Usage))
+	out.Usage = *(*metrics.ResourceList)(unsafe.Pointer(&in.Usage))
 	return nil
 }

--- a/staging/src/k8s.io/metrics/pkg/apis/metrics/zz_generated.deepcopy.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/zz_generated.deepcopy.go
@@ -24,7 +24,6 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
-	api "k8s.io/client-go/pkg/api"
 	reflect "reflect"
 )
@@ -51,7 +50,7 @@ func DeepCopy_metrics_ContainerMetrics(in interface{}, out interface{}, c *conve
 		*out = *in
 		if in.Usage != nil {
 			in, out := &in.Usage, &out.Usage
-			*out = make(api.ResourceList)
+			*out = make(ResourceList)
 			for key, val := range *in {
 				(*out)[key] = val.DeepCopy()
 			}
@@ -73,7 +72,7 @@ func DeepCopy_metrics_NodeMetrics(in interface{}, out interface{}, c *conversion
 		out.Timestamp = in.Timestamp.DeepCopy()
 		if in.Usage != nil {
 			in, out := &in.Usage, &out.Usage
-			*out = make(api.ResourceList)
+			*out = make(ResourceList)
 			for key, val := range *in {
 				(*out)[key] = val.DeepCopy()
 			}

--- a/staging/src/k8s.io/metrics/pkg/client/custom_metrics/BUILD
+++ b/staging/src/k8s.io/metrics/pkg/client/custom_metrics/BUILD
@@ -19,7 +19,7 @@ go_library(
        "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/api:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
        "//vendor/k8s.io/client-go/rest:go_default_library",
        "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library",
        "//vendor/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1:go_default_library",

--- a/staging/src/k8s.io/metrics/pkg/client/custom_metrics/client.go
+++ b/staging/src/k8s.io/metrics/pkg/client/custom_metrics/client.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
-	"k8s.io/client-go/pkg/api"
+	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/util/flowcontrol"
 	"k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1"
@@ -35,7 +35,9 @@ type customMetricsClient struct {
 }
 func New(client rest.Interface) CustomMetricsClient {
-	return NewForMapper(client, api.Registry.RESTMapper())
+	return &customMetricsClient{
+		client: client,
+	}
 }
 func NewForConfig(c *rest.Config) (CustomMetricsClient, error) {
@@ -48,7 +50,7 @@ func NewForConfig(c *rest.Config) (CustomMetricsClient, error) {
 		configShallowCopy.UserAgent = rest.DefaultKubernetesUserAgent()
 	}
 	configShallowCopy.GroupVersion = &v1alpha1.SchemeGroupVersion
-	configShallowCopy.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs}
+	configShallowCopy.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}
 	client, err := rest.RESTClientFor(&configShallowCopy)
 	if err != nil {
@@ -66,6 +68,8 @@ func NewForConfigOrDie(c *rest.Config) CustomMetricsClient {
 	return client
 }
+// NewForMapper constucts the client with a RESTMapper, which allows more
+// accurate translation from GroupVersionKind to GroupVersionResource.
 func NewForMapper(client rest.Interface, mapper meta.RESTMapper) CustomMetricsClient {
 	return &customMetricsClient{
 		client: client,
@@ -85,6 +89,15 @@ func (c *customMetricsClient) NamespacedMetrics(namespace string) MetricsInterfa
 }
 func (c *customMetricsClient) qualResourceForKind(groupKind schema.GroupKind) (string, error) {
+	if c.mapper == nil {
+		// the version doesn't matter
+		gvk := groupKind.WithVersion("")
+		gvr, _ := meta.UnsafeGuessKindToResource(gvk)
+		gr := gvr.GroupResource()
+		return gr.String(), nil
+	}
+	// use the mapper if it's available
 	mapping, err := c.mapper.RESTMapping(groupKind)
 	if err != nil {
 		return "", fmt.Errorf("unable to map kind %s to resource: %v", groupKind.String(), err)
@@ -94,7 +107,6 @@ func (c *customMetricsClient) qualResourceForKind(groupKind schema.GroupKind) (s
 		Group:    mapping.GroupVersionKind.Group,
 		Resource: mapping.Resource,
 	}
 	return groupResource.String(), nil
 }