Merge pull request #43522 from cblecker/staging-godep-ignore

Automatic merge from submit-queue Ignore GoVersion and GodepVersion in staging-godep diff **What this PR does / why we need it**: This modifies the hack/update-staging-godeps.sh script to ignore GoVersion and GodepVersion in the diff it makes, similar to what hack/verify-godeps.sh does **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**: **Release note**: ```release-note NONE ```

Merge pull request #43522 from cblecker/staging-godep-ignore
7564849f · Kubernetes Submit Queue · GitHub · c8e15e13 · 74ab8729 · 7564849f
Commit 7564849f authored Mar 26, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 26, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

update-staging-godeps.sh hack/update-staging-godeps.sh +1 -1

No files found.
--- a/hack/update-staging-godeps.sh
+++ b/hack/update-staging-godeps.sh
@@ -99,7 +99,7 @@ for repo in $(ls ${KUBE_ROOT}/staging/src/k8s.io); do
  updateGodepManifest "${repo}"
  if [ "${FAIL_ON_DIFF}" == true ]; then
-    diff --ignore-matching-lines='^\s*\"Comment\"' -u "${KUBE_ROOT}/staging/src/k8s.io/${repo}/Godeps" "${TMP_GOPATH}/src/k8s.io/${repo}/Godeps/Godeps.json"
+    diff --ignore-matching-lines='^\s*\"GoVersion\":' --ignore-matching-line='^\s*\"GodepVersion\":' --ignore-matching-lines='^\s*\"Comment\"' -u "${KUBE_ROOT}/staging/src/k8s.io/${repo}/Godeps" "${TMP_GOPATH}/src/k8s.io/${repo}/Godeps/Godeps.json"
  fi
  if [ "${DRY_RUN}" != true ]; then
    cp "${TMP_GOPATH}/src/k8s.io/${repo}/Godeps/Godeps.json" "${KUBE_ROOT}/staging/src/k8s.io/${repo}/Godeps"