From 8b878b04958f5865b2968089fc1c9ebf4308ec9a Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Mon, 7 Nov 2016 17:54:52 -0800 Subject: [PATCH] Make kubernetes-src.tar.gz contain source code again --- build-tools/lib/release.sh | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/build-tools/lib/release.sh b/build-tools/lib/release.sh index 4459e77697b..3a63126d7f0 100644 --- 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. -function kube::release::package_build_image_tarball() { +# Package the source code we built, for compliance/licensing/audit/yadda. +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