diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD index a9d8968191e..d735068257c 100644 --- a/cmd/kube-controller-manager/app/BUILD +++ b/cmd/kube-controller-manager/app/BUILD @@ -126,7 +126,7 @@ go_library( "//vendor/k8s.io/client-go/tools/leaderelection/resourcelock: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/client/clientset_generated/clientset/typed/metrics/v1alpha1:go_default_library", + "//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1:go_default_library", "//vendor/k8s.io/metrics/pkg/client/custom_metrics:go_default_library", ], ) diff --git a/cmd/kube-controller-manager/app/autoscaling.go b/cmd/kube-controller-manager/app/autoscaling.go index e791c6c4af9..2a7d83f1db8 100644 --- a/cmd/kube-controller-manager/app/autoscaling.go +++ b/cmd/kube-controller-manager/app/autoscaling.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/kubernetes/pkg/controller/podautoscaler" "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" - resourceclient "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1" + resourceclient "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1" "k8s.io/metrics/pkg/client/custom_metrics" ) diff --git a/pkg/controller/podautoscaler/BUILD b/pkg/controller/podautoscaler/BUILD index fbe36c3b3ba..5dce69e8f02 100644 --- a/pkg/controller/podautoscaler/BUILD +++ b/pkg/controller/podautoscaler/BUILD @@ -80,6 +80,7 @@ go_test( "//vendor/k8s.io/heapster/metrics/api/v1/types:go_default_library", "//vendor/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1:go_default_library", "//vendor/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library", + "//vendor/k8s.io/metrics/pkg/apis/metrics/v1beta1:go_default_library", "//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake:go_default_library", "//vendor/k8s.io/metrics/pkg/client/custom_metrics/fake:go_default_library", ], diff --git a/pkg/controller/podautoscaler/horizontal_test.go b/pkg/controller/podautoscaler/horizontal_test.go index ff6fd6f7314..a6599f6da89 100644 --- a/pkg/controller/podautoscaler/horizontal_test.go +++ b/pkg/controller/podautoscaler/horizontal_test.go @@ -45,7 +45,7 @@ import ( cmfake "k8s.io/metrics/pkg/client/custom_metrics/fake" cmapi "k8s.io/metrics/pkg/apis/custom_metrics/v1beta1" - metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1" + metricsapi "k8s.io/metrics/pkg/apis/metrics/v1beta1" "github.com/stretchr/testify/assert" @@ -549,7 +549,7 @@ func (tc *testCase) setupController(t *testing.T) (*HorizontalController, inform testCMClient = tc.testCMClient } metricsClient := metrics.NewRESTMetricsClient( - testMetricsClient.MetricsV1alpha1(), + testMetricsClient.MetricsV1beta1(), testCMClient, ) diff --git a/pkg/controller/podautoscaler/metrics/BUILD b/pkg/controller/podautoscaler/metrics/BUILD index 2bdf20cff21..d6d1c41b17a 100644 --- a/pkg/controller/podautoscaler/metrics/BUILD +++ b/pkg/controller/podautoscaler/metrics/BUILD @@ -26,7 +26,7 @@ go_library( "//vendor/k8s.io/heapster/metrics/api/v1/types:go_default_library", "//vendor/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1:go_default_library", "//vendor/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library", - "//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1:go_default_library", + "//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1:go_default_library", "//vendor/k8s.io/metrics/pkg/client/custom_metrics:go_default_library", ], ) @@ -55,6 +55,7 @@ go_test( "//vendor/k8s.io/heapster/metrics/api/v1/types:go_default_library", "//vendor/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1:go_default_library", "//vendor/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library", + "//vendor/k8s.io/metrics/pkg/apis/metrics/v1beta1:go_default_library", "//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake:go_default_library", "//vendor/k8s.io/metrics/pkg/client/custom_metrics/fake:go_default_library", ], diff --git a/pkg/controller/podautoscaler/metrics/rest_metrics_client.go b/pkg/controller/podautoscaler/metrics/rest_metrics_client.go index cf24a3fa606..9cb79160327 100644 --- a/pkg/controller/podautoscaler/metrics/rest_metrics_client.go +++ b/pkg/controller/podautoscaler/metrics/rest_metrics_client.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" customapi "k8s.io/metrics/pkg/apis/custom_metrics/v1beta1" - resourceclient "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1" + resourceclient "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1beta1" customclient "k8s.io/metrics/pkg/client/custom_metrics" ) diff --git a/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go b/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go index 141cdb6b764..4516e2b65ca 100644 --- a/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go +++ b/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go @@ -37,7 +37,7 @@ import ( cmfake "k8s.io/metrics/pkg/client/custom_metrics/fake" cmapi "k8s.io/metrics/pkg/apis/custom_metrics/v1beta1" - metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1" + metricsapi "k8s.io/metrics/pkg/apis/metrics/v1beta1" "github.com/stretchr/testify/assert" ) @@ -185,7 +185,7 @@ func (tc *restClientTestCase) verifyResults(t *testing.T, metrics PodMetricsInfo func (tc *restClientTestCase) runTest(t *testing.T) { testMetricsClient, testCMClient := tc.prepareTestClient(t) - metricsClient := NewRESTMetricsClient(testMetricsClient.MetricsV1alpha1(), testCMClient) + metricsClient := NewRESTMetricsClient(testMetricsClient.MetricsV1beta1(), testCMClient) isResource := len(tc.resourceName) > 0 if isResource { info, timestamp, err := metricsClient.GetResourceMetric(kv1.ResourceName(tc.resourceName), tc.namespace, tc.selector) diff --git a/pkg/controller/podautoscaler/replica_calculator_test.go b/pkg/controller/podautoscaler/replica_calculator_test.go index 2c26260cdf9..cfdefdc36ed 100644 --- a/pkg/controller/podautoscaler/replica_calculator_test.go +++ b/pkg/controller/podautoscaler/replica_calculator_test.go @@ -36,7 +36,7 @@ import ( cmfake "k8s.io/metrics/pkg/client/custom_metrics/fake" cmapi "k8s.io/metrics/pkg/apis/custom_metrics/v1beta1" - metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1" + metricsapi "k8s.io/metrics/pkg/apis/metrics/v1beta1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -243,7 +243,7 @@ func (tc *replicaCalcTestCase) prepareTestClient(t *testing.T) (*fake.Clientset, func (tc *replicaCalcTestCase) runTest(t *testing.T) { testClient, testMetricsClient, testCMClient := tc.prepareTestClient(t) - metricsClient := metrics.NewRESTMetricsClient(testMetricsClient.MetricsV1alpha1(), testCMClient) + metricsClient := metrics.NewRESTMetricsClient(testMetricsClient.MetricsV1beta1(), testCMClient) replicaCalc := &ReplicaCalculator{ metricsClient: metricsClient,