github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #51653 from DirectXMan12/versions/metrics-v2beta1

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 51603, 51653)

Graduate metrics/v1alpha1 to v1beta1

This introduces v1beta1 of the resource metrics API, previously in alpha.
The v1alpha1 version remains for compatibility with the Heapster legacy version
of the resource metrics API, which is compatible with the v1alpha1 version.  It also
renames the v1beta1 version to `resource-metrics.metrics.k8s.io`.

The HPA controller's REST clients (but not the legacy client) have been migrated as well.

Part of kubernetes/features#118.

```release-note
Migrate the metrics/v1alpha1 API to metrics/v1beta1.  The HorizontalPodAutoscaler
controller REST client now uses that version.  For v1beta1, the API is now known as
resource-metrics.metrics.k8s.io.
```
This commit is contained in:
Kubernetes Submit Queue
2017-09-06 02:55:12 -07:00
committed by GitHub
parent ecfee6a9c9 e1a22e8cae
commit 0076f02df0
44 changed files with 2910 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/controller/podautoscaler/BUILD
View File

@@ -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",
],

4
pkg/controller/podautoscaler/horizontal_test.go
View File

@@ -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,
)

3
pkg/controller/podautoscaler/metrics/BUILD
View File

@@ -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",
],

2
pkg/controller/podautoscaler/metrics/rest_metrics_client.go
View File

@@ -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"
)

4
pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go
View File

@@ -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)

4
pkg/controller/podautoscaler/replica_calculator_test.go
View File

@@ -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,