Merge pull request #36407 from ixdy/fix-source-tarball

Automatic merge from submit-queue Make kubernetes-src.tar.gz contain source code again **What this PR does / why we need it**: This PR fixes `kubernetes-src.tar.gz` by reviving the logic for `kube-source.tar.gz` from before #30787. **Which issue this PR fixes**: fixes #36403 @saad-ali @jbeda @zmerlynn

Merge pull request #36407 from ixdy/fix-source-tarball
03348bb8 · Kubernetes Submit Queue · GitHub · 2e4e9323 · 8b878b04 · 03348bb8
Commit 03348bb8 authored Nov 08, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 4 deletions

release.sh build-tools/lib/release.sh +14 -4

No files found.
--- a/build-tools/lib/release.sh
+++ b/build-tools/lib/release.sh
@@ -83,7 +83,7 @@ function kube::release::package_tarballs() {
  # Clean out any old releases
  rm -rf "${RELEASE_DIR}"
  mkdir -p "${RELEASE_DIR}"
-  kube::release::package_build_image_tarball &
+  kube::release::package_src_tarball &
  kube::release::package_client_tarballs &
  kube::release::package_server_tarballs &
  kube::release::package_salt_tarball &
@@ -95,10 +95,20 @@ function kube::release::package_tarballs() {
  kube::util::wait-for-jobs || { kube::log::error "previous tarball phase failed"; return 1; }
 }
-# Package the build image we used from the previous stage, for compliance/licensing/audit/yadda.
+# Package the source code we built, for compliance/licensing/audit/yadda.
-function kube::release::package_build_image_tarball() {
+function kube::release::package_src_tarball() {
  kube::log::status "Building tarball: src"
-  "${TAR}" czf "${RELEASE_DIR}/kubernetes-src.tar.gz" -C "${LOCAL_OUTPUT_BUILD_CONTEXT}" .
+  local source_files=(
+    $(cd "${KUBE_ROOT}" && find . -mindepth 1 -maxdepth 1 \
+      -not \( \
+        \( -path ./_\*        -o \
+           -path ./.git\*     -o \
+           -path ./.config/\* -o \
+           -path ./.gsutil/\*    \
+        \) -prune \
+      \))
+  )
+  "${TAR}" czf "${RELEASE_DIR}/kubernetes-src.tar.gz" -C "${KUBE_ROOT}" "${source_files[@]}"
 }
 # Package up all of the cross compiled clients. Over time this should grow into