Skip to content

Commit abb0183

Browse files
authored
Merge pull request kubernetes#88990 from spiffxp/use-gtar-in-build-lib-release
Replace raw usages of tar in build/lib/release.sh
2 parents e2bc3a7 + 6b21505 commit abb0183

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

build/lib/release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ function kube::release::package_kube_manifests_tarball() {
439439
cp "${KUBE_ROOT}/cluster/gce/gci/health-monitor.sh" "${dst_dir}/health-monitor.sh"
440440
# Merge GCE-specific addons with general purpose addons.
441441
for d in cluster/addons cluster/gce/addons; do
442-
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}"
442+
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}"
443443
done
444444

445445
kube::release::clean_cruft
@@ -505,7 +505,7 @@ function kube::release::package_test_tarballs() {
505505
# the portable test tarball.
506506
mkdir -p "${release_stage}/test/images"
507507
cp -fR "${KUBE_ROOT}/test/images" "${release_stage}/test/"
508-
tar c "${KUBE_TEST_PORTABLE[@]}" | tar x -C "${release_stage}"
508+
"${TAR}" c "${KUBE_TEST_PORTABLE[@]}" | "${TAR}" x -C "${release_stage}"
509509

510510
kube::release::clean_cruft
511511

0 commit comments

Comments
 (0)