mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Merge pull request #88990 from spiffxp/use-gtar-in-build-lib-release
Replace raw usages of tar in build/lib/release.sh
This commit is contained in:
commit
abb0183e30
@ -439,7 +439,7 @@ function kube::release::package_kube_manifests_tarball() {
|
||||
cp "${KUBE_ROOT}/cluster/gce/gci/health-monitor.sh" "${dst_dir}/health-monitor.sh"
|
||||
# Merge GCE-specific addons with general purpose addons.
|
||||
for d in cluster/addons cluster/gce/addons; do
|
||||
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}"
|
||||
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}"
|
||||
done
|
||||
|
||||
kube::release::clean_cruft
|
||||
@ -505,7 +505,7 @@ function kube::release::package_test_tarballs() {
|
||||
# the portable test tarball.
|
||||
mkdir -p "${release_stage}/test/images"
|
||||
cp -fR "${KUBE_ROOT}/test/images" "${release_stage}/test/"
|
||||
tar c "${KUBE_TEST_PORTABLE[@]}" | tar x -C "${release_stage}"
|
||||
"${TAR}" c "${KUBE_TEST_PORTABLE[@]}" | "${TAR}" x -C "${release_stage}"
|
||||
|
||||
kube::release::clean_cruft
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user