From 83235f940abb0ff638e8d91769cc19fe6df70c0e Mon Sep 17 00:00:00 2001
From: Chao Xu <xuchao@google.com>
Date: Sun, 11 Jun 2017 15:18:51 -0700
Subject: [PATCH] manually fix hack/verify-staging-imports.sh

manually fix hack/godep-save.sh

manually fix .linted_packages

squash, manually fix lint

manually fix hack/update-staging-godeps.sh

manually fix update-staging-godeps.sh; let it update godep of client-go
---
 hack/.linted_packages          |  7 ++++++-
 hack/godep-save.sh             |  3 +++
 hack/update-staging-godeps.sh  |  4 ++--
 hack/verify-staging-imports.sh | 11 ++++++-----
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/hack/.linted_packages b/hack/.linted_packages
index 6a58a36ce19..734990b75cf 100644
--- a/hack/.linted_packages
+++ b/hack/.linted_packages
@@ -178,7 +178,6 @@ pkg/client/listers/imagepolicy/v1alpha1
 pkg/client/listers/networking/internalversion
 pkg/client/listers/networking/v1
 pkg/client/listers/policy/internalversion
-pkg/client/listers/policy/v1alpha1
 pkg/client/listers/policy/v1beta1
 pkg/client/listers/rbac/internalversion
 pkg/client/listers/rbac/v1alpha1
@@ -418,6 +417,11 @@ staging/src/k8s.io/client-go/informers/storage/v1
 staging/src/k8s.io/client-go/informers/storage/v1beta1
 staging/src/k8s.io/client-go/listers/admissionregistration/v1alpha1
 staging/src/k8s.io/client-go/listers/apps/v1beta1
+staging/src/k8s.io/client-go/listers/authentication/v1
+staging/src/k8s.io/client-go/listers/authentication/v1beta1
+staging/src/k8s.io/client-go/listers/authorization/v1
+staging/src/k8s.io/client-go/listers/authorization/v1beta1
+staging/src/k8s.io/client-go/listers/authorization/v1beta1
 staging/src/k8s.io/client-go/listers/autoscaling/v1
 staging/src/k8s.io/client-go/listers/autoscaling/v2alpha1
 staging/src/k8s.io/client-go/listers/batch/v1
@@ -425,6 +429,7 @@ staging/src/k8s.io/client-go/listers/batch/v2alpha1
 staging/src/k8s.io/client-go/listers/certificates/v1beta1
 staging/src/k8s.io/client-go/listers/core/v1
 staging/src/k8s.io/client-go/listers/extensions/v1beta1
+staging/src/k8s.io/client-go/listers/imagepolicy/v1alpha1
 staging/src/k8s.io/client-go/listers/networking/v1
 staging/src/k8s.io/client-go/listers/policy/v1beta1
 staging/src/k8s.io/client-go/listers/rbac/v1alpha1
diff --git a/hack/godep-save.sh b/hack/godep-save.sh
index 085304dff25..5749eb9facc 100755
--- a/hack/godep-save.sh
+++ b/hack/godep-save.sh
@@ -38,6 +38,9 @@ pushd "${KUBE_ROOT}" > /dev/null
 
   # create a symlink in vendor directory pointing to the staging client. This
   # let other packages use the staging client as if it were vendored.
+  if [ ! -e "vendor/k8s.io/api" ]; then
+    ln -s ../../staging/src/k8s.io/api vendor/k8s.io/api
+  fi
   if [ ! -e "vendor/k8s.io/client-go" ]; then
     ln -s ../../staging/src/k8s.io/client-go vendor/k8s.io/client-go
   fi
diff --git a/hack/update-staging-godeps.sh b/hack/update-staging-godeps.sh
index c58410cef0f..784c5c6e3e7 100755
--- a/hack/update-staging-godeps.sh
+++ b/hack/update-staging-godeps.sh
@@ -79,8 +79,8 @@ function updateGodepManifest() {
 # move into staging and save the dependencies for everything in order
 mkdir -p "${TMP_GOPATH}/src/k8s.io"
 for repo in $(ls ${KUBE_ROOT}/staging/src/k8s.io); do
-  # we have to skip client-go because it does unusual manipulation of its godeps
-  if [ "${repo}" == "client-go" ]; then
+  # we have to skip api because it does not depend on anything
+  if [ "${repo}" == "api" ]; then
     continue
   fi
   # we skip metrics because it's synced to the real repo manually
diff --git a/hack/verify-staging-imports.sh b/hack/verify-staging-imports.sh
index 66ccd73eabe..8ef5a6a18b7 100755
--- a/hack/verify-staging-imports.sh
+++ b/hack/verify-staging-imports.sh
@@ -66,11 +66,12 @@ function print_forbidden_imports () {
 
 RC=0
 print_forbidden_imports apimachinery || RC=1
-print_forbidden_imports client-go k8s.io/apimachinery || RC=1
-print_forbidden_imports apiserver k8s.io/apimachinery k8s.io/client-go || RC=1
-print_forbidden_imports kube-aggregator k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver || RC=1
-print_forbidden_imports sample-apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver || RC=1
-print_forbidden_imports apiextensions-apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver || RC=1
+print_forbidden_imports api k8s.io/apimachinery || RC=1
+print_forbidden_imports client-go k8s.io/apimachinery k8s.io/api || RC=1
+print_forbidden_imports apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/api || RC=1
+print_forbidden_imports kube-aggregator k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver k8s.io/api || RC=1
+print_forbidden_imports sample-apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver k8s.io/api || RC=1
+print_forbidden_imports apiextensions-apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver k8s.io/api || RC=1
 if [ ${RC} != 0 ]; then
     exit ${RC}
 fi