github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

Move HPA to use custom-metrics/v1beta1

Browse Source 
This commit migrates the HPA metrics clients to use the beta version of
the custom metrics API.
This commit is contained in:
Solly Ross 2017-08-17 14:50:51 -04:00
parent 98b1a08d7e
commit 89a56a3cee
9 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/.golint_failures
View File

@ -786,7 +786,7 @@ staging/src/k8s.io/kube-aggregator/pkg/controllers/status
staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice
staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice/etcd
staging/src/k8s.io/metrics/pkg/apis/custom_metrics
staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1
staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1
staging/src/k8s.io/metrics/pkg/apis/metrics
staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1
staging/src/k8s.io/metrics/pkg/client/custom_metrics

2
pkg/controller/podautoscaler/BUILD
View File

@ -78,7 +78,7 @@ go_test(
"//vendor/k8s.io/client-go/rest:go_default_library",
"//vendor/k8s.io/client-go/testing:go_default_library",
"//vendor/k8s.io/heapster/metrics/api/v1/types:go_default_library",
"//vendor/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1: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/fake:go_default_library",
"//vendor/k8s.io/metrics/pkg/client/custom_metrics/fake:go_default_library",

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

@ -44,7 +44,7 @@ import (
metricsfake "k8s.io/metrics/pkg/client/clientset_generated/clientset/fake"
cmfake "k8s.io/metrics/pkg/client/custom_metrics/fake"
cmapi "k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1"
cmapi "k8s.io/metrics/pkg/apis/custom_metrics/v1beta1"
metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1"
"github.com/stretchr/testify/assert"

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

@ -24,7 +24,7 @@ go_library(
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
"//vendor/k8s.io/heapster/metrics/api/v1/types:go_default_library",
"//vendor/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1: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/custom_metrics:go_default_library",
@ -53,7 +53,7 @@ go_test(
"//vendor/k8s.io/client-go/rest:go_default_library",
"//vendor/k8s.io/client-go/testing:go_default_library",
"//vendor/k8s.io/heapster/metrics/api/v1/types:go_default_library",
"//vendor/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1: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/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

@ -27,7 +27,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime/schema"
customapi "k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1"
customapi "k8s.io/metrics/pkg/apis/custom_metrics/v1beta1"
resourceclient "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1"
customclient "k8s.io/metrics/pkg/client/custom_metrics"
)

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

@ -36,7 +36,7 @@ import (
metricsfake "k8s.io/metrics/pkg/client/clientset_generated/clientset/fake"
cmfake "k8s.io/metrics/pkg/client/custom_metrics/fake"
cmapi "k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1"
cmapi "k8s.io/metrics/pkg/apis/custom_metrics/v1beta1"
metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1"
"github.com/stretchr/testify/assert"

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

@ -35,7 +35,7 @@ import (
metricsfake "k8s.io/metrics/pkg/client/clientset_generated/clientset/fake"
cmfake "k8s.io/metrics/pkg/client/custom_metrics/fake"
cmapi "k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1"
cmapi "k8s.io/metrics/pkg/apis/custom_metrics/v1beta1"
metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1"
"github.com/stretchr/testify/assert"

2
staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/cmd.go
View File

@ -98,7 +98,7 @@ func New() *Generator {
`k8s.io/api/networking/v1`,
`k8s.io/kubernetes/federation/apis/federation/v1beta1`,
`k8s.io/metrics/pkg/apis/metrics/v1alpha1`,
`k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1`,
`k8s.io/metrics/pkg/apis/custom_metrics/v1beta1`,
`k8s.io/apiserver/pkg/apis/audit/v1alpha1`,
}, ","),
DropEmbeddedFields: "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta",

72
staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1/generated.pb.go
View File

@ -665,40 +665,40 @@ func init() {
}
var fileDescriptorGenerated = []byte{
// 545 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xc1, 0x6f, 0xd3, 0x30,
0x14, 0xc6, 0x9b, 0x95, 0xa2, 0xcd, 0xd5, 0x54, 0x96, 0x0b, 0x51, 0x0f, 0x69, 0x55, 0x2e, 0x05,
0x09, 0x5b, 0x2d, 0x08, 0x71, 0xe0, 0x14, 0x71, 0x41, 0xa2, 0x20, 0xb2, 0x09, 0x10, 0x20, 0x21,
0xd7, 0x79, 0x4d, 0x4d, 0x9b, 0x38, 0xb2, 0x9d, 0x4e, 0xbb, 0x71, 0xe2, 0xcc, 0x9f, 0xd5, 0xe3,
0xc4, 0x69, 0xa7, 0x8a, 0x86, 0x7f, 0x04, 0x25, 0x75, 0xda, 0x6e, 0x65, 0xc0, 0x6e, 0xb1, 0xfd,
0xbe, 0x9f, 0xbf, 0xef, 0x3d, 0x07, 0xbd, 0x9f, 0x3c, 0x55, 0x98, 0x0b, 0x32, 0x49, 0x87, 0x20,
0x63, 0xd0, 0xa0, 0xc8, 0x0c, 0xe2, 0x40, 0x48, 0x62, 0x0e, 0x22, 0xd0, 0x92, 0x33, 0x45, 0x92,
0x49, 0x48, 0x68, 0xc2, 0x15, 0x61, 0xa9, 0xd2, 0x22, 0xfa, 0x5c, 0xee, 0xcf, 0x7a, 0x74, 0x9a,
0x8c, 0x69, 0x8f, 0x84, 0x10, 0x83, 0xa4, 0x1a, 0x02, 0x9c, 0x48, 0xa1, 0x85, 0x6d, 0x00, 0xd8,
0x14, 0xe2, 0x64, 0x12, 0xe2, 0x1c, 0x80, 0x2f, 0x03, 0x70, 0x09, 0x68, 0x3e, 0x0c, 0xb9, 0x1e,
0xa7, 0x43, 0xcc, 0x44, 0x44, 0x42, 0x11, 0x0a, 0x52, 0x70, 0x86, 0xe9, 0xa8, 0x58, 0x15, 0x8b,
0xe2, 0x6b, 0xc5, 0x6f, 0x76, 0x8c, 0x41, 0x9a, 0x70, 0xc2, 0x84, 0x04, 0x32, 0xdb, 0xf1, 0xd0,
0x7c, 0xbc, 0xa9, 0x89, 0x28, 0x1b, 0xf3, 0x18, 0xe4, 0x59, 0x99, 0x84, 0x48, 0x50, 0x22, 0x95,
0x0c, 0x6e, 0xa4, 0x52, 0x79, 0x43, 0xe8, 0x9f, 0xee, 0x22, 0xd7, 0xa9, 0x64, 0x1a, 0x6b, 0x1e,
0xed, 0x5e, 0xf3, 0xe4, 0x5f, 0x02, 0xc5, 0xc6, 0x10, 0xd1, 0x1d, 0xdd, 0xa3, 0xeb, 0x74, 0xa9,
0xe6, 0x53, 0xc2, 0x63, 0xad, 0xb4, 0xbc, 0x2a, 0xea, 0x7c, 0xab, 0xa2, 0xfa, 0xa0, 0xe8, 0xf8,
0x5b, 0x3a, 0x4d, 0xc1, 0x1e, 0xa1, 0x46, 0x00, 0x8a, 0x49, 0x3e, 0x84, 0xe0, 0xf5, 0xf0, 0x0b,
0x30, 0xed, 0x58, 0x6d, 0xab, 0x5b, 0xef, 0xdf, 0xc3, 0x66, 0x6e, 0x34, 0xe1, 0x38, 0xef, 0x2b,
0x9e, 0xf5, 0xf0, 0xaa, 0xc2, 0x87, 0x11, 0x48, 0x88, 0x19, 0x78, 0x77, 0xe7, 0x8b, 0x56, 0x25,
0x5b, 0xb4, 0x1a, 0xcf, 0x2f, 0x33, 0xfc, 0xab, 0x50, 0xbb, 0x8f, 0xd0, 0x6a, 0xd0, 0xaf, 0x68,
0x04, 0xce, 0x5e, 0xdb, 0xea, 0x1e, 0x78, 0xb6, 0x51, 0xa3, 0xc1, 0xfa, 0xc4, 0xdf, 0xaa, 0xb2,
0x3f, 0xa2, 0x83, 0x3c, 0xbf, 0xd2, 0x34, 0x4a, 0x9c, 0x6a, 0xe1, 0xea, 0xc1, 0x96, 0xab, 0x75,
0xe8, 0xcd, 0x93, 0xca, 0x67, 0x92, 0xfb, 0x3c, 0xe1, 0x11, 0x78, 0x47, 0x06, 0x7f, 0x70, 0x52,
0x42, 0xfc, 0x0d, 0xcf, 0xbe, 0x8f, 0x6e, 0x9f, 0xf2, 0x38, 0x10, 0xa7, 0xce, 0xad, 0xb6, 0xd5,
0xad, 0x7a, 0x47, 0xd9, 0xa2, 0x75, 0xf8, 0xae, 0xd8, 0x39, 0x06, 0x26, 0xe2, 0x40, 0xf9, 0xa6,
0xc0, 0x3e, 0x46, 0xb5, 0x59, 0xde, 0x2c, 0xa7, 0x56, 0x78, 0xc0, 0x7f, 0xf3, 0x80, 0xcb, 0xd7,
0x84, 0xdf, 0xa4, 0x34, 0xd6, 0x5c, 0x9f, 0x79, 0x87, 0xc6, 0x47, 0xad, 0xe8, 0xb8, 0xbf, 0x62,
0x75, 0x7e, 0x58, 0xa8, 0xb1, 0x35, 0x88, 0x97, 0x5c, 0x69, 0xfb, 0x13, 0xda, 0xcf, 0x13, 0x04,
0x54, 0x53, 0x33, 0x05, 0xfc, 0x7f, 0x79, 0x73, 0xf5, 0x00, 0x34, 0xf5, 0xee, 0x98, 0xbb, 0xf6,
0xcb, 0x1d, 0x7f, 0x4d, 0xb4, 0x29, 0xaa, 0x71, 0x0d, 0x91, 0x72, 0xf6, 0xda, 0xd5, 0x6e, 0xbd,
0xff, 0x0c, 0xdf, 0xf0, 0xc7, 0xc4, 0x5b, 0x76, 0x37, 0xa1, 0x5e, 0xe4, 0x48, 0x7f, 0x45, 0xf6,
0xf0, 0x7c, 0xe9, 0x56, 0xce, 0x97, 0x6e, 0xe5, 0x62, 0xe9, 0x56, 0xbe, 0x66, 0xae, 0x35, 0xcf,
0x5c, 0xeb, 0x3c, 0x73, 0xad, 0x8b, 0xcc, 0xb5, 0x7e, 0x66, 0xae, 0xf5, 0xfd, 0x97, 0x5b, 0xf9,
0xb0, 0x5f, 0x12, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x80, 0xcc, 0x75, 0x01, 0x76, 0x04, 0x00,
0x00,
// 546 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x41, 0x6f, 0xd3, 0x3e,
0x18, 0xc6, 0x9b, 0xf5, 0xdf, 0x3f, 0x9b, 0xab, 0xa9, 0x2c, 0x17, 0xa2, 0x1e, 0xd2, 0xaa, 0x5c,
0x0a, 0xd2, 0x6c, 0xb5, 0x20, 0x84, 0xc4, 0x2d, 0xe2, 0x82, 0x44, 0x41, 0x64, 0x13, 0x93, 0x00,
0x09, 0x9c, 0xe4, 0x6d, 0x6a, 0xba, 0xc4, 0x91, 0xed, 0x74, 0xda, 0x8d, 0x13, 0x67, 0x3e, 0x56,
0x8f, 0xe3, 0xb6, 0x53, 0x45, 0xc3, 0x17, 0x41, 0x49, 0x9c, 0xb6, 0x5b, 0x19, 0xb0, 0x5b, 0x6c,
0xbf, 0xcf, 0xcf, 0xcf, 0xf3, 0xbe, 0x0e, 0x3a, 0x99, 0x3e, 0x95, 0x98, 0x71, 0x32, 0x4d, 0x3d,
0x10, 0x31, 0x28, 0x90, 0x64, 0x06, 0x71, 0xc0, 0x05, 0xd1, 0x07, 0x11, 0x28, 0xc1, 0x7c, 0x49,
0x92, 0x69, 0x48, 0x68, 0xc2, 0x24, 0xf1, 0x53, 0xa9, 0x78, 0xf4, 0xb1, 0xda, 0x9f, 0x0d, 0x3c,
0x50, 0x74, 0x40, 0x42, 0x88, 0x41, 0x50, 0x05, 0x01, 0x4e, 0x04, 0x57, 0xdc, 0xc4, 0xa5, 0x1e,
0xeb, 0x3a, 0x9c, 0x4c, 0x43, 0x9c, 0xeb, 0xf1, 0x55, 0x3d, 0xd6, 0xfa, 0xf6, 0x61, 0xc8, 0xd4,
0x24, 0xf5, 0xb0, 0xcf, 0x23, 0x12, 0xf2, 0x90, 0x93, 0x02, 0xe3, 0xa5, 0xe3, 0x62, 0x55, 0x2c,
0x8a, 0xaf, 0x12, 0xdf, 0xee, 0x69, 0x7b, 0x34, 0x61, 0xc4, 0xe7, 0x02, 0xc8, 0x6c, 0xcb, 0x42,
0xfb, 0xf1, 0xba, 0x26, 0xa2, 0xfe, 0x84, 0xc5, 0x20, 0xce, 0xab, 0x1c, 0x44, 0x80, 0xe4, 0xa9,
0xf0, 0xe1, 0x56, 0x2a, 0x99, 0xb7, 0x83, 0xfe, 0xee, 0x2e, 0x72, 0x93, 0x4a, 0xa4, 0xb1, 0x62,
0xd1, 0xf6, 0x35, 0x4f, 0xfe, 0x26, 0x90, 0xfe, 0x04, 0x22, 0xba, 0xa5, 0x7b, 0x74, 0x93, 0x2e,
0x55, 0xec, 0x94, 0xb0, 0x58, 0x49, 0x25, 0xae, 0x8b, 0x7a, 0x5f, 0xeb, 0xa8, 0x39, 0x2a, 0x1a,
0xfe, 0x96, 0x9e, 0xa6, 0x60, 0x8e, 0x51, 0x2b, 0x00, 0xe9, 0x0b, 0xe6, 0x41, 0xf0, 0xda, 0xfb,
0x0c, 0xbe, 0xb2, 0x8c, 0xae, 0xd1, 0x6f, 0x0e, 0xef, 0x57, 0x63, 0xa3, 0x09, 0xc3, 0x79, 0x5f,
0xf1, 0x6c, 0x80, 0xcb, 0x0a, 0x17, 0xc6, 0x20, 0x20, 0xf6, 0xc1, 0xb9, 0x37, 0x5f, 0x74, 0x6a,
0xd9, 0xa2, 0xd3, 0x7a, 0x7e, 0x95, 0xe1, 0x5e, 0x87, 0x9a, 0x43, 0x84, 0xca, 0x39, 0xbf, 0xa2,
0x11, 0x58, 0x3b, 0x5d, 0xa3, 0xbf, 0xe7, 0x98, 0x5a, 0x8d, 0x46, 0xab, 0x13, 0x77, 0xa3, 0xca,
0x7c, 0x8f, 0xf6, 0xf2, 0xfc, 0x52, 0xd1, 0x28, 0xb1, 0xea, 0x85, 0xab, 0x87, 0x1b, 0xae, 0x56,
0xa1, 0xd7, 0x2f, 0x2a, 0x9f, 0x49, 0xee, 0xf3, 0x98, 0x45, 0xe0, 0x1c, 0x68, 0xfc, 0xde, 0x71,
0x05, 0x71, 0xd7, 0x3c, 0xf3, 0x01, 0xfa, 0xff, 0x8c, 0xc5, 0x01, 0x3f, 0xb3, 0xfe, 0xeb, 0x1a,
0xfd, 0xba, 0x73, 0x90, 0x2d, 0x3a, 0xfb, 0x27, 0xc5, 0xce, 0x11, 0xf8, 0x3c, 0x0e, 0xa4, 0xab,
0x0b, 0xcc, 0x23, 0xd4, 0x98, 0xe5, 0xcd, 0xb2, 0x1a, 0x85, 0x07, 0xfc, 0x27, 0x0f, 0xb8, 0x7a,
0x4d, 0xf8, 0x4d, 0x4a, 0x63, 0xc5, 0xd4, 0xb9, 0xb3, 0xaf, 0x7d, 0x34, 0x8a, 0x8e, 0xbb, 0x25,
0xab, 0xf7, 0xdd, 0x40, 0xad, 0x8d, 0x41, 0xbc, 0x64, 0x52, 0x99, 0x1f, 0xd0, 0x6e, 0x9e, 0x20,
0xa0, 0x8a, 0xea, 0x29, 0xe0, 0x7f, 0xcb, 0x9b, 0xab, 0x47, 0xa0, 0xa8, 0x73, 0x57, 0xdf, 0xb5,
0x5b, 0xed, 0xb8, 0x2b, 0xa2, 0xf9, 0x09, 0x35, 0x98, 0x82, 0x48, 0x5a, 0x3b, 0xdd, 0x7a, 0xbf,
0x39, 0x7c, 0x76, 0xcb, 0xff, 0x12, 0x6f, 0xb8, 0x5d, 0x67, 0x7a, 0x91, 0x13, 0xdd, 0x12, 0xec,
0x1c, 0xce, 0x97, 0x76, 0xed, 0x62, 0x69, 0xd7, 0x2e, 0x97, 0x76, 0xed, 0x4b, 0x66, 0x1b, 0xf3,
0xcc, 0x36, 0x2e, 0x32, 0xdb, 0xb8, 0xcc, 0x6c, 0xe3, 0x47, 0x66, 0x1b, 0xdf, 0x7e, 0xda, 0xb5,
0x77, 0x77, 0x34, 0xf0, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x64, 0x6b, 0xb8, 0x76, 0x72, 0x04,
0x00, 0x00,
}