github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #53985 from sttts/sttts-mac-fixes 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix build scripts on Mac
pull/6/head
Kubernetes Submit Queue 2017-10-16 09:22:12 -07:00 committed by GitHub
parent a6625085f5 4156ec979b
commit 8b1bdd8e8e
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/common.sh
View File

@ -330,7 +330,7 @@ function kube::build::has_docker() {
} }
function kube::build::has_ip() { function kube::build::has_ip() {
ip -Version | grep 'iproute2' &> /dev/null which ip &> /dev/null && ip -Version | grep 'iproute2' &> /dev/null
} }
# Detect if a specific image exists # Detect if a specific image exists

11
hack/update-bazel.sh
View File

@ -20,6 +20,15 @@ set -o pipefail
export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
if LANG=C sed --help 2>&1 | grep -q GNU; then
SED="sed"
elif which gsed &>/dev/null; then
SED="gsed"
else
echo "Failed to find GNU sed as sed or gsed. If you are on Mac: brew install gnu-sed." >&2
exit 1
fi
# Remove generated files prior to running kazel. # Remove generated files prior to running kazel.
# TODO(spxtr): Remove this line once Bazel is the only way to build. # TODO(spxtr): Remove this line once Bazel is the only way to build.
rm -f "${KUBE_ROOT}/pkg/generated/openapi/zz_generated.openapi.go" rm -f "${KUBE_ROOT}/pkg/generated/openapi/zz_generated.openapi.go"
@ -44,6 +53,6 @@ gazelle fix \
# gazelle won't follow the symlinks in vendor/, so we can't just exclude # gazelle won't follow the symlinks in vendor/, so we can't just exclude
# staging/. Instead we just fix the bad paths with sed. # staging/. Instead we just fix the bad paths with sed.
find staging -name BUILD -o -name BUILD.bazel | \ find staging -name BUILD -o -name BUILD.bazel | \
xargs sed -i 's|\(importpath = "\)k8s.io/kubernetes/staging/src/\(.*\)|\1\2|' xargs ${SED} -i 's|\(importpath = "\)k8s.io/kubernetes/staging/src/\(.*\)|\1\2|'
kazel kazel