From f407700af91de685ce5aa7570f9f3d24b2c5790b Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Thu, 28 Jun 2018 14:35:04 -0400 Subject: [PATCH] Add autoscaling/v2beta2 and custom_metrics/v1beta2 to necessary files --- hack/.golint_failures | 4 ++++ hack/lib/init.sh | 1 + hack/update-generated-protobuf-dockerized.sh | 2 ++ pkg/master/master.go | 2 ++ 4 files changed, 9 insertions(+) diff --git a/hack/.golint_failures b/hack/.golint_failures index 46426eb91a5..6eaa15a435d 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -46,6 +46,7 @@ pkg/apis/authorization/validation pkg/apis/autoscaling pkg/apis/autoscaling/v1 pkg/apis/autoscaling/v2beta1 +pkg/apis/autoscaling/v2beta2 pkg/apis/autoscaling/validation pkg/apis/batch pkg/apis/batch/v1 @@ -461,6 +462,7 @@ staging/src/k8s.io/api/authorization/v1 staging/src/k8s.io/api/authorization/v1beta1 staging/src/k8s.io/api/autoscaling/v1 staging/src/k8s.io/api/autoscaling/v2beta1 +staging/src/k8s.io/api/autoscaling/v2beta2 staging/src/k8s.io/api/batch/v1 staging/src/k8s.io/api/batch/v1beta1 staging/src/k8s.io/api/batch/v2alpha1 @@ -705,6 +707,7 @@ 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/v1beta1 +staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta2 staging/src/k8s.io/metrics/pkg/apis/external_metrics staging/src/k8s.io/metrics/pkg/apis/external_metrics/v1beta1 staging/src/k8s.io/metrics/pkg/apis/metrics @@ -712,6 +715,7 @@ staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1 staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1 staging/src/k8s.io/metrics/pkg/client/custom_metrics staging/src/k8s.io/metrics/pkg/client/custom_metrics/fake +staging/src/k8s.io/metrics/pkg/client/custom_metrics/scheme staging/src/k8s.io/metrics/pkg/client/external_metrics staging/src/k8s.io/metrics/pkg/client/external_metrics/fake staging/src/k8s.io/sample-apiserver/pkg/admission/plugin/banflunder diff --git a/hack/lib/init.sh b/hack/lib/init.sh index e97b34fe8db..a9ef8415f41 100755 --- a/hack/lib/init.sh +++ b/hack/lib/init.sh @@ -68,6 +68,7 @@ authorization.k8s.io/v1 \ authorization.k8s.io/v1beta1 \ autoscaling/v1 \ autoscaling/v2beta1 \ +autoscaling/v2beta2 \ batch/v1 \ batch/v1beta1 \ batch/v2alpha1 \ diff --git a/hack/update-generated-protobuf-dockerized.sh b/hack/update-generated-protobuf-dockerized.sh index 6acbb386d5f..798f832fc81 100755 --- a/hack/update-generated-protobuf-dockerized.sh +++ b/hack/update-generated-protobuf-dockerized.sh @@ -52,6 +52,7 @@ PACKAGES=( k8s.io/api/autoscaling/v1 k8s.io/api/authorization/v1 k8s.io/api/autoscaling/v2beta1 + k8s.io/api/autoscaling/v2beta2 k8s.io/api/authorization/v1beta1 k8s.io/api/batch/v1 k8s.io/api/batch/v1beta1 @@ -81,6 +82,7 @@ PACKAGES=( k8s.io/metrics/pkg/apis/metrics/v1alpha1 k8s.io/metrics/pkg/apis/metrics/v1beta1 k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 + k8s.io/metrics/pkg/apis/custom_metrics/v1beta2 k8s.io/metrics/pkg/apis/external_metrics/v1beta1 k8s.io/apiserver/pkg/apis/audit/v1alpha1 k8s.io/apiserver/pkg/apis/audit/v1beta1 diff --git a/pkg/master/master.go b/pkg/master/master.go index 22a4ac85add..37c672c7094 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -35,6 +35,7 @@ import ( authorizationapiv1beta1 "k8s.io/api/authorization/v1beta1" autoscalingapiv1 "k8s.io/api/autoscaling/v1" autoscalingapiv2beta1 "k8s.io/api/autoscaling/v2beta1" + autoscalingapiv2beta2 "k8s.io/api/autoscaling/v2beta2" batchapiv1 "k8s.io/api/batch/v1" batchapiv1beta1 "k8s.io/api/batch/v1beta1" batchapiv2alpha1 "k8s.io/api/batch/v2alpha1" @@ -487,6 +488,7 @@ func DefaultAPIResourceConfigSource() *serverstorage.ResourceConfig { authorizationapiv1beta1.SchemeGroupVersion, autoscalingapiv1.SchemeGroupVersion, autoscalingapiv2beta1.SchemeGroupVersion, + autoscalingapiv2beta2.SchemeGroupVersion, batchapiv1.SchemeGroupVersion, batchapiv1beta1.SchemeGroupVersion, certificatesapiv1beta1.SchemeGroupVersion,