From b5a41e770a3f769e12a342b79adc4c085cb80da5 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Fri, 5 May 2017 11:14:37 -0700 Subject: [PATCH] remove unnecessary call to metrics install package remove init and reference to client-go/api from metrcis install package --- cmd/kube-controller-manager/app/autoscaling.go | 4 ---- .../metrics/pkg/apis/custom_metrics/install/install.go | 5 ----- .../src/k8s.io/metrics/pkg/apis/metrics/install/install.go | 5 ----- 3 files changed, 14 deletions(-) diff --git a/cmd/kube-controller-manager/app/autoscaling.go b/cmd/kube-controller-manager/app/autoscaling.go index 6a0328a507d..e791c6c4af9 100644 --- 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) { diff --git 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 index 5b620c85dc7..1f325e16f7d 100644 --- 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( diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/install/install.go b/staging/src/k8s.io/metrics/pkg/apis/metrics/install/install.go index 957d7793ae2..823be25ffd9 100644 --- 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(