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
```
This commit is contained in:
Kubernetes Submit Queue 2017-08-14 19:49:00 -07:00 committed by GitHub
commit ef9e3ecbfc
2 changed files with 12 additions and 0 deletions

View File

@ -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

View File

@ -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