Merge pull request kubernetes#30738 from caesarxuchao/copy-keep-vendor

Automatic merge from submit-queue

Keep vendor/ and Godep/ when creating the staging client, add a readme

In copy.sh, instead of removing the vendor/, moving it to _vendor. vendor/ is needed when we publish the staging client to its own repository.

hack/lib/util.sh

@@ -260,6 +260,7 @@ kube::util::gen-analytics() {
   mdfiles=($( find "${dir}" -name "*.md" -type f \
               -not -path '*/\.*' \
               -not -path "${path}/vendor/*" \
+              -not -path "${path}/staging/*" \
               -not -path "${path}/third_party/*" \
               -not -path "${path}/_gopath/*" \
               -not -path "${path}/_output/*" \

hack/verify-flags-underscore.py

@@ -55,6 +55,8 @@ def get_all_files(rootdir):
         # don't visit certain dirs
         if 'vendor' in dirs:
             dirs.remove('vendor')
+        if 'staging' in dirs:
+            dirs.remove('staging')
         if '_output' in dirs:
             dirs.remove('_output')
         if '_gopath' in dirs:

hack/verify-gofmt.sh

@@ -37,6 +37,7 @@ find_files() {
         -o -wholename './target' \
         -o -wholename '*/third_party/*' \
         -o -wholename '*/vendor/*' \
+        -o -wholename './staging' \
       \) -prune \
     \) -name '*.go'
 }

staging/README.md

@@ -0,0 +1,3 @@
+This _staging/src/k8s.io/client-go directory is the staging area of the client repo. It contains a versioned client, tools built around the client like the reflector, and all the client dependencies. The content will be periodically published to k8s.io/client-go repo.
+The staged content is copied from the main repo, i.e., k8s.io/kubernetes, with directory rearrangement and necessary rewritings. To sync the content with the latest code in your local k8s.io/kubernetes, you need to run `godep restore` in k8s root directory, then run _staging/src/k8s.io/client-go/copy.sh.
+vendor/k8s.io/client-go is a symlink pointing to this staging area, so to use the packages in the staging area, you can import it as "vendor/client-go/<package-name>", as if the client were vendored. The client will be vendored from k8s.io/client-go for real after the test matrix is converted to vendor k8s components.