From 7d5dbdaa09198e5cc13bc3a25a2b302a308703a9 Mon Sep 17 00:00:00 2001
From: Chao Xu <xuchao@google.com>
Date: Wed, 10 May 2017 18:15:09 -0700
Subject: [PATCH] manually fix protogen

---
 .../go2idl/go-to-protobuf/protobuf/cmd.go     | 44 +++++++++----------
 hack/verify-generated-protobuf.sh             |  2 +-
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go
index 975310953a0..cbe4423c3e6 100644
--- a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go
+++ b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go
@@ -71,33 +71,31 @@ func New() *Generator {
 			`k8s.io/apiserver/pkg/apis/example/v1`,
 			`k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1`,
 			`k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1`,
-			`k8s.io/kubernetes/pkg/api/v1`,
-			`k8s.io/kubernetes/pkg/apis/policy/v1beta1`,
-			`k8s.io/kubernetes/pkg/apis/extensions/v1beta1`,
-			`k8s.io/kubernetes/pkg/apis/autoscaling/v1`,
-			`k8s.io/kubernetes/pkg/apis/authorization/v1`,
-			`k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1`,
-			`k8s.io/kubernetes/pkg/apis/authorization/v1beta1`,
-			`k8s.io/kubernetes/pkg/apis/batch/v1`,
-			`k8s.io/kubernetes/pkg/apis/batch/v2alpha1`,
-			`k8s.io/kubernetes/pkg/apis/apps/v1beta1`,
-			`k8s.io/kubernetes/pkg/apis/authentication/v1`,
-			`k8s.io/kubernetes/pkg/apis/authentication/v1beta1`,
-			`k8s.io/kubernetes/pkg/apis/rbac/v1alpha1`,
-			`k8s.io/kubernetes/pkg/apis/rbac/v1beta1`,
+			`k8s.io/api/core/v1`,
+			`k8s.io/api/policy/v1beta1`,
+			`k8s.io/api/extensions/v1beta1`,
+			`k8s.io/api/autoscaling/v1`,
+			`k8s.io/api/authorization/v1`,
+			`k8s.io/api/autoscaling/v2alpha1`,
+			`k8s.io/api/authorization/v1beta1`,
+			`k8s.io/api/batch/v1`,
+			`k8s.io/api/batch/v2alpha1`,
+			`k8s.io/api/apps/v1beta1`,
+			`k8s.io/api/authentication/v1`,
+			`k8s.io/api/authentication/v1beta1`,
+			`k8s.io/api/rbac/v1alpha1`,
+			`k8s.io/api/rbac/v1beta1`,
+			`k8s.io/api/certificates/v1beta1`,
+			`k8s.io/api/imagepolicy/v1alpha1`,
+			`k8s.io/api/settings/v1alpha1`,
+			`k8s.io/api/storage/v1beta1`,
+			`k8s.io/api/storage/v1`,
+			`k8s.io/api/admissionregistration/v1alpha1`,
+			`k8s.io/api/networking/v1`,
 			`k8s.io/kubernetes/federation/apis/federation/v1beta1`,
-			`k8s.io/kubernetes/pkg/apis/certificates/v1beta1`,
-			`k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1`,
-			`k8s.io/kubernetes/pkg/apis/settings/v1alpha1`,
-			`k8s.io/kubernetes/pkg/apis/storage/v1beta1`,
-			`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`,
-			`k8s.io/kubernetes/pkg/apis/networking/v1`,
-			`-k8s.io/client-go/pkg/apis/authentication/v1`,
 			`k8s.io/apiserver/pkg/apis/audit/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 dd849f5a9b4..de0b4dbbb96 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 staging/src/k8s.io/metrics/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/api staging/src/k8s.io/metrics/pkg/apis}
 _tmp="${KUBE_ROOT}/_tmp"
 
 cleanup() {