From 7b8e572d8a01b83829023a16e1b421a6c6ed824a Mon Sep 17 00:00:00 2001 From: Solly Ross Date: Mon, 15 May 2017 13:59:51 -0400 Subject: [PATCH] [go-to-protobuf] generate proto for k8s.io/metrics This commit adds the `k8s.io/metrics` APIs to the list of packages for which to generate protobuf. Additionally, it adds `k8s.io/client-go/pkg/apis/v1` as a non-generated (referenced) package. --- cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go | 3 +++ hack/verify-generated-protobuf.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go index 1e7b7f7901d..a9c1e390d9f 100644 --- a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go +++ b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go @@ -92,6 +92,9 @@ func New() *Generator { `k8s.io/kubernetes/pkg/apis/storage/v1`, `k8s.io/kubernetes/pkg/apis/admission/v1alpha1`, `k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1`, + `-k8s.io/client-go/pkg/api/v1`, + `k8s.io/metrics/pkg/apis/metrics/v1alpha1`, + `k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1`, }, ","), DropEmbeddedFields: "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta", } diff --git a/hack/verify-generated-protobuf.sh b/hack/verify-generated-protobuf.sh index 1e607a4d883..dd849f5a9b4 100755 --- a/hack/verify-generated-protobuf.sh +++ b/hack/verify-generated-protobuf.sh @@ -23,7 +23,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh" kube::golang::setup_env -APIROOTS=${APIROOTS:-pkg/api pkg/apis pkg/runtime pkg/util/intstr pkg/watch staging/src/k8s.io/apimachinery/pkg/api staging/src/k8s.io/apimachinery/pkg/apis staging/src/k8s.io/apiserver/pkg staging/src/k8s.io/client-go/pkg/api staging/src/k8s.io/client-go/pkg/apis} +APIROOTS=${APIROOTS:-pkg/api pkg/apis pkg/runtime pkg/util/intstr pkg/watch staging/src/k8s.io/apimachinery/pkg/api staging/src/k8s.io/apimachinery/pkg/apis staging/src/k8s.io/apiserver/pkg staging/src/k8s.io/client-go/pkg/api staging/src/k8s.io/client-go/pkg/apis staging/src/k8s.io/metrics/pkg/apis} _tmp="${KUBE_ROOT}/_tmp" cleanup() {