github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Simplify and improve find/tar lines

Browse Source 
Signed-off-by: Joakim Roubert <joakimr@axis.com>
This commit is contained in:
Joakim Roubert 2020-01-18 17:00:06 +01:00
parent b69a38667e
commit 82f3f33eea
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/lib/release.sh
View File

@ -112,7 +112,7 @@ function kube::release::package_src_tarball() {
git archive -o "${src_tarball}" HEAD git archive -o "${src_tarball}" HEAD
else else
find "${KUBE_ROOT}" -mindepth 1 -maxdepth 1 \ find "${KUBE_ROOT}" -mindepth 1 -maxdepth 1 \
-not \( \ ! \( \
\( -path "${KUBE_ROOT}"/_\* -o \ \( -path "${KUBE_ROOT}"/_\* -o \
-path "${KUBE_ROOT}"/.git\* -o \ -path "${KUBE_ROOT}"/.git\* -o \
-path "${KUBE_ROOT}"/.config\* -o \ -path "${KUBE_ROOT}"/.config\* -o \
@ -348,7 +348,6 @@ function kube::release::create_docker_images_for_server() {
local images_dir local images_dir
binary_dir="$1" binary_dir="$1"
arch="$2" arch="$2"
binary_name
binaries=$(kube::build::get_docker_wrapped_binaries "${arch}") binaries=$(kube::build::get_docker_wrapped_binaries "${arch}")
images_dir="${RELEASE_IMAGES}/${arch}" images_dir="${RELEASE_IMAGES}/${arch}"
mkdir -p "${images_dir}" mkdir -p "${images_dir}"
@ -466,15 +465,10 @@ function kube::release::package_kube_manifests_tarball() {
cp "${KUBE_ROOT}/cluster/gce/gci/gke-internal-configure-helper.sh" "${dst_dir}/" cp "${KUBE_ROOT}/cluster/gce/gci/gke-internal-configure-helper.sh" "${dst_dir}/"
fi fi
cp "${KUBE_ROOT}/cluster/gce/gci/health-monitor.sh" "${dst_dir}/health-monitor.sh" cp "${KUBE_ROOT}/cluster/gce/gci/health-monitor.sh" "${dst_dir}/health-monitor.sh"
local objects
objects=$(cd "${KUBE_ROOT}/cluster/addons" && find . \( -name \*.yaml -or -name \*.yaml.in -or -name \*.json \) | grep -v demo)
tar c -C "${KUBE_ROOT}/cluster/addons" "${objects}" | tar x -C "${dst_dir}"
# Merge GCE-specific addons with general purpose addons. # Merge GCE-specific addons with general purpose addons.
local gce_objects for d in cluster/addons cluster/gce/addons; do
gce_objects=$(cd "${KUBE_ROOT}/cluster/gce/addons" && find . \( -name \*.yaml -or -name \*.yaml.in -or -name \*.json \) \( -not -name \*demo\* \)) find "${KUBE_ROOT}/${d}" \( \( -name \*.yaml -o -name \*.yaml.in -o -name \*.json \) -a ! \( -name \*demo\* \) \) -print0 | tar c --transform "s|${KUBE_ROOT#/*}/${d}||" --null -T - | "${TAR}" x -C "${dst_dir}"
if [[ -n ${gce_objects} ]]; then done
tar c -C "${KUBE_ROOT}/cluster/gce/addons" "${gce_objects}" | tar x -C "${dst_dir}"
fi
kube::release::clean_cruft kube::release::clean_cruft