Skip to content

Commit 53b485a

Browse files
authored
Merge pull request #19890 from k8s-infra-cherrypick-robot/cherry-pick-19862-to-release-3.6
[release-3.6] release: Fix the tar unzip command, avoid permissions issues
2 parents 8d1d1a9 + c774d44 commit 53b485a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

scripts/release_notes.tpl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ rm -f /tmp/etcd-${ETCD_VER}-linux-amd64.tar.gz
1616
rm -rf /tmp/etcd-download-test && mkdir -p /tmp/etcd-download-test
1717

1818
curl -L ${DOWNLOAD_URL}/${ETCD_VER}/etcd-${ETCD_VER}-linux-amd64.tar.gz -o /tmp/etcd-${ETCD_VER}-linux-amd64.tar.gz
19-
tar xzvf /tmp/etcd-${ETCD_VER}-linux-amd64.tar.gz -C /tmp/etcd-download-test --strip-components=1
19+
tar xzvf /tmp/etcd-${ETCD_VER}-linux-amd64.tar.gz -C /tmp/etcd-download-test --strip-components=1 --no-same-owner
2020
rm -f /tmp/etcd-${ETCD_VER}-linux-amd64.tar.gz
2121

2222
/tmp/etcd-download-test/etcd --version

scripts/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ function release_pass {
596596
;;
597597
esac
598598

599-
tar xzvf "/tmp/$file" -C /tmp/ --strip-components=1
599+
tar xzvf "/tmp/$file" -C /tmp/ --strip-components=1 --no-same-owner
600600
mkdir -p ./bin
601601
mv /tmp/etcd ./bin/etcd-last-release
602602
}

0 commit comments

Comments
 (0)