mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
Merge pull request #30276 from nhlfr/mesos-build-fix
Automatic merge from submit-queue Avoid duplicated contrib/ sources This commit removes a part of common.sh script which copied contrib/ sources for enabled contribs, which resulted in the duplicated files inside tarball. Fixes #30150 <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30276) <!-- Reviewable:end -->
This commit is contained in:
commit
f2d9aaba4d
@ -485,11 +485,6 @@ function kube::build::source_targets() {
|
|||||||
\( -path ./_\* -o -path ./.git\* \) -prune \
|
\( -path ./_\* -o -path ./.git\* \) -prune \
|
||||||
\))
|
\))
|
||||||
)
|
)
|
||||||
if [ -n "${KUBERNETES_CONTRIB:-}" ]; then
|
|
||||||
for contrib in "${KUBERNETES_CONTRIB}"; do
|
|
||||||
targets+=($(eval "kube::contrib::${contrib}::source_targets"))
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
echo "${targets[@]}"
|
echo "${targets[@]}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user