From 54e948ce82b0c9bd0af360575d9f97fc5c766208 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Fri, 3 May 2019 11:18:14 -0400 Subject: [PATCH] Verify apimachinery protobuf --- hack/verify-generated-protobuf.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hack/verify-generated-protobuf.sh b/hack/verify-generated-protobuf.sh index 5637afe045..81a737d35f 100755 --- a/hack/verify-generated-protobuf.sh +++ b/hack/verify-generated-protobuf.sh @@ -23,7 +23,12 @@ source "${KUBE_ROOT}/hack/lib/init.sh" kube::golang::setup_env -APIROOTS=$(git grep --files-with-matches -e '// +k8s:protobuf-gen=package' cmd pkg staging | xargs -n 1 dirname | sort | uniq) +APIROOTS=$({ + # gather the packages explicitly requesting generation + git grep --files-with-matches -e '// +k8s:protobuf-gen=package' cmd pkg staging | xargs -n 1 dirname + # add the root apimachinery pkg containing implicitly generated files (--apimachinery-packages) + echo staging/src/k8s.io/apimachinery/pkg +} | sort | uniq) _tmp="${KUBE_ROOT}/_tmp"