Merge pull request #50417 from dims/avoid-rsync-dot-git-directory

Automatic merge from submit-queue (batch tested with PRs 49129, 50436, 50417, 50553, 47587) Avoid rsync of .git directory **What this PR does / why we need it**: We don't really need the .git directory to be transferred. This problem was introduced in the PR #46193: "Run the update-staging-godeps script inside a docker container" **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: Fixes #50272 **Release note**: ```release-note NONE ```

Merge pull request #50417 from dims/avoid-rsync-dot-git-directory
ef9e3ecb · Kubernetes Submit Queue · GitHub · 9ac6e4ae · 827af63e · ef9e3ecb
Commit ef9e3ecb authored Aug 14, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

common.sh build/common.sh +3 -0

update-staging-godeps-dockerized.sh hack/update-staging-godeps-dockerized.sh +9 -0

No files found.
--- a/build/common.sh
+++ b/build/common.sh
@@ -682,10 +682,13 @@ function kube::build::sync_to_container() {
  # they will not be re-generated by 'make'.
  kube::build::rsync \
    --delete \
+    --filter='- /.git/' \
    --filter='- /.make/' \
    --filter='- /_tmp/' \
    --filter='- /_output/' \
    --filter='- /' \
+    --filter='- zz_generated.*' \
+    --filter='- generated.proto' \
    "${KUBE_ROOT}/" "rsync://k8s@${KUBE_RSYNC_ADDR}/k8s/"
  kube::build::stop_rsyncd_container

--- a/hack/update-staging-godeps-dockerized.sh
+++ b/hack/update-staging-godeps-dockerized.sh
@@ -87,6 +87,15 @@ function diffGodepManifest() {
  fi
 }
+# Create a fake git repo for staging to prevent godeps from complaining
+pushd "${KUBE_ROOT}" >/dev/null
+  git init >/dev/null
+  git config --local user.email "nobody@k8s.io"
+  git config --local user.name "$0"
+  git add . >/dev/null
+  git commit -q -m "Snapshot" >/dev/null
+popd >/dev/null
 # 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