From 67ebe733c52b7a46d1a7ad144adbb90ce1a72fcf Mon Sep 17 00:00:00 2001 From: Yusuke Kato Date: Fri, 11 Oct 2024 11:43:54 +0900 Subject: [PATCH] Add CPU_INFO_FLAGS for Apple Silicon (#2694) Signed-off-by: kpango --- .gitignore | 0 .whitesource | 0 CODE_OF_CONDUCT.md | 0 CONTRIBUTING.md | 0 Makefile | 2 +- README.md | 0 charts/vald/.helmignore | 0 charts/vald/templates/_helpers.tpl | 0 cmd/filter/egress/.gitkeep | 0 cmd/filter/ingress/.gitkeep | 0 design/Vald Architecture Overview.drawio | 0 dockers/agent/core/agent/Dockerfile | 2 +- dockers/ci/base/Dockerfile | 2 +- dockers/dev/Dockerfile | 2 +- go.mod | 4 +-- go.sum | 8 +++--- pkg/discoverer/k8s/README.md | 0 pkg/filter/egress/.gitkeep | 0 pkg/filter/ingress/.gitkeep | 0 pkg/gateway/filter/README.md | 0 pkg/gateway/lb/README.md | 0 pkg/gateway/mirror/README.md | 0 renovate.json | 0 rust/Cargo.lock | 32 ++++++++++++------------ versions/TELEPRESENCE_VERSION | 2 +- 25 files changed, 27 insertions(+), 27 deletions(-) mode change 100755 => 100644 .gitignore mode change 100755 => 100644 .whitesource mode change 100755 => 100644 CODE_OF_CONDUCT.md mode change 100755 => 100644 CONTRIBUTING.md mode change 100755 => 100644 README.md mode change 100755 => 100644 charts/vald/.helmignore mode change 100755 => 100644 charts/vald/templates/_helpers.tpl mode change 100755 => 100644 cmd/filter/egress/.gitkeep mode change 100755 => 100644 cmd/filter/ingress/.gitkeep mode change 100755 => 100644 design/Vald Architecture Overview.drawio mode change 100755 => 100644 pkg/discoverer/k8s/README.md mode change 100755 => 100644 pkg/filter/egress/.gitkeep mode change 100755 => 100644 pkg/filter/ingress/.gitkeep mode change 100755 => 100644 pkg/gateway/filter/README.md mode change 100755 => 100644 pkg/gateway/lb/README.md mode change 100755 => 100644 pkg/gateway/mirror/README.md mode change 100755 => 100644 renovate.json diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/.whitesource b/.whitesource old mode 100755 new mode 100644 diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md old mode 100755 new mode 100644 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md old mode 100755 new mode 100644 diff --git a/Makefile b/Makefile index dc8b9f5fd4..3280bc5f36 100644 --- a/Makefile +++ b/Makefile @@ -127,7 +127,7 @@ ifeq ($(UNAME),Linux) CPU_INFO_FLAGS := $(eval CPU_INFO_FLAGS := $(shell cat /proc/cpuinfo | grep flags | cut -d " " -f 2- | head -1))$(CPU_INFO_FLAGS) CORES := $(eval CORES := $(shell nproc 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null))$(CORES) else ifeq ($(UNAME),Darwin) -CPU_INFO_FLAGS := "" +CPU_INFO_FLAGS := $(eval CPU_INFO_FLAGS := $(shell sysctl -n machdep.cpu.brand_string 2>/dev/null || echo "Apple Silicon"))$(CPU_INFO_FLAGS) CORES := $(eval CORES := $(shell sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null))$(CORES) else CPU_INFO_FLAGS := "" diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/charts/vald/.helmignore b/charts/vald/.helmignore old mode 100755 new mode 100644 diff --git a/charts/vald/templates/_helpers.tpl b/charts/vald/templates/_helpers.tpl old mode 100755 new mode 100644 diff --git a/cmd/filter/egress/.gitkeep b/cmd/filter/egress/.gitkeep old mode 100755 new mode 100644 diff --git a/cmd/filter/ingress/.gitkeep b/cmd/filter/ingress/.gitkeep old mode 100755 new mode 100644 diff --git a/design/Vald Architecture Overview.drawio b/design/Vald Architecture Overview.drawio old mode 100755 new mode 100644 diff --git a/dockers/agent/core/agent/Dockerfile b/dockers/agent/core/agent/Dockerfile index 5c39dcda13..1a87ca7bec 100644 --- a/dockers/agent/core/agent/Dockerfile +++ b/dockers/agent/core/agent/Dockerfile @@ -39,8 +39,8 @@ ENV REPO=vald ENV RUST_HOME=/usr/local/lib/rust ENV TZ=Etc/UTC ENV USER=root -ENV CARGO_HOME=${RUST_HOME}/cargo ENV RUSTUP_HOME=${RUST_HOME}/rustup +ENV CARGO_HOME=${RUST_HOME}/cargo ENV PATH=${CARGO_HOME}/bin:${RUSTUP_HOME}/bin:/usr/local/bin:${PATH} WORKDIR ${HOME}/rust/src/github.com/${ORG}/${REPO} SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/dockers/ci/base/Dockerfile b/dockers/ci/base/Dockerfile index 2b39d02e0a..6c73efea03 100644 --- a/dockers/ci/base/Dockerfile +++ b/dockers/ci/base/Dockerfile @@ -44,8 +44,8 @@ ENV REPO=vald ENV RUST_HOME=/usr/local/lib/rust ENV TZ=Etc/UTC ENV USER=root -ENV CARGO_HOME=${RUST_HOME}/cargo ENV RUSTUP_HOME=${RUST_HOME}/rustup +ENV CARGO_HOME=${RUST_HOME}/cargo ENV PATH=${CARGO_HOME}/bin:${GOPATH}/bin:${GOROOT}/bin:${RUSTUP_HOME}/bin:/usr/local/bin:${PATH} WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/dockers/dev/Dockerfile b/dockers/dev/Dockerfile index 8a13638a03..0e0996b5e7 100644 --- a/dockers/dev/Dockerfile +++ b/dockers/dev/Dockerfile @@ -44,8 +44,8 @@ ENV REPO=vald ENV RUST_HOME=/usr/local/lib/rust ENV TZ=Etc/UTC ENV USER=root -ENV RUSTUP_HOME=${RUST_HOME}/rustup ENV CARGO_HOME=${RUST_HOME}/cargo +ENV RUSTUP_HOME=${RUST_HOME}/rustup ENV PATH=${CARGO_HOME}/bin:${GOPATH}/bin:${GOROOT}/bin:${RUSTUP_HOME}/bin:/usr/local/bin:${PATH} WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/go.mod b/go.mod index 32383dd068..d4b03e46ca 100644 --- a/go.mod +++ b/go.mod @@ -293,7 +293,7 @@ replace ( go.uber.org/goleak => go.uber.org/goleak v1.3.0 go.uber.org/multierr => go.uber.org/multierr v1.11.0 go.uber.org/zap => go.uber.org/zap v1.27.0 - gocloud.dev => gocloud.dev v0.39.0 + gocloud.dev => gocloud.dev v0.40.0 golang.org/x/crypto => golang.org/x/crypto v0.28.0 golang.org/x/exp => golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c golang.org/x/exp/typeparams => golang.org/x/exp/typeparams v0.0.0-20241009180824-f66d83c29e7c @@ -342,7 +342,7 @@ replace ( nhooyr.io/websocket => nhooyr.io/websocket v1.8.17 rsc.io/pdf => rsc.io/pdf v0.1.1 sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.19.0 - sigs.k8s.io/json => sigs.k8s.io/json v0.0.0-20241009153224-e386a8af8d30 + sigs.k8s.io/json => sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 sigs.k8s.io/kustomize => sigs.k8s.io/kustomize v2.0.3+incompatible sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.4.1 sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.4.0 diff --git a/go.sum b/go.sum index 3b819e5cfd..eef48ed8a4 100644 --- a/go.sum +++ b/go.sum @@ -717,8 +717,8 @@ go.uber.org/ratelimit v0.3.1 h1:K4qVE+byfv/B3tC+4nYWP7v/6SimcO7HzHekoMNBma0= go.uber.org/ratelimit v0.3.1/go.mod h1:6euWsTB6U/Nb3X++xEUXA8ciPJvr19Q/0h1+oDcJhRk= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= -gocloud.dev v0.39.0 h1:EYABYGhAalPUaMrbSKOr5lejxoxvXj99nE8XFtsDgds= -gocloud.dev v0.39.0/go.mod h1:drz+VyYNBvrMTW0KZiBAYEdl8lbNZx+OQ7oQvdrFmSQ= +gocloud.dev v0.40.0 h1:f8LgP+4WDqOG/RXoUcyLpeIAGOcAbZrZbDQCUee10ng= +gocloud.dev v0.40.0/go.mod h1:drz+VyYNBvrMTW0KZiBAYEdl8lbNZx+OQ7oQvdrFmSQ= golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY= @@ -848,8 +848,8 @@ rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q= sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= -sigs.k8s.io/json v0.0.0-20241009153224-e386a8af8d30 h1:ObU1vgTtAle8WwCKgcDkPjLJYwlazQpIjzSA0asMhy4= -sigs.k8s.io/json v0.0.0-20241009153224-e386a8af8d30/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= +sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= +sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo= sigs.k8s.io/kustomize/api v0.17.2 h1:E7/Fjk7V5fboiuijoZHgs4aHuexi5Y2loXlVOAVAG5g= sigs.k8s.io/kustomize/api v0.17.2/go.mod h1:UWTz9Ct+MvoeQsHcJ5e+vziRRkwimm3HytpZgIYqye0= sigs.k8s.io/kustomize/kyaml v0.17.1 h1:TnxYQxFXzbmNG6gOINgGWQt09GghzgTP6mIurOgrLCQ= diff --git a/pkg/discoverer/k8s/README.md b/pkg/discoverer/k8s/README.md old mode 100755 new mode 100644 diff --git a/pkg/filter/egress/.gitkeep b/pkg/filter/egress/.gitkeep old mode 100755 new mode 100644 diff --git a/pkg/filter/ingress/.gitkeep b/pkg/filter/ingress/.gitkeep old mode 100755 new mode 100644 diff --git a/pkg/gateway/filter/README.md b/pkg/gateway/filter/README.md old mode 100755 new mode 100644 diff --git a/pkg/gateway/lb/README.md b/pkg/gateway/lb/README.md old mode 100755 new mode 100644 diff --git a/pkg/gateway/mirror/README.md b/pkg/gateway/mirror/README.md old mode 100755 new mode 100644 diff --git a/renovate.json b/renovate.json old mode 100755 new mode 100644 diff --git a/rust/Cargo.lock b/rust/Cargo.lock index dec8f75b75..e61ab6414f 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -2411,9 +2411,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.71" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cb94a0ffd3f3ee755c20f7d8752f45cac88605a4dcf808abcff72873296ec7b" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -4324,9 +4324,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.94" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef073ced962d62984fb38a36e5fdc1a2b23c9e0e1fa0689bb97afa4202ef6887" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -4335,9 +4335,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.94" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4bfab14ef75323f4eb75fa52ee0a3fb59611977fd3240da19b2cf36ff85030e" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", @@ -4350,9 +4350,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.44" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65471f79c1022ffa5291d33520cbbb53b7687b01c2f8e83b57d102eed7ed479d" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -4362,9 +4362,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.94" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7bec9830f60924d9ceb3ef99d55c155be8afa76954edffbb5936ff4509474e7" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4372,9 +4372,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.94" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c74f6e152a76a2ad448e223b0fc0b6b5747649c3d769cc6bf45737bf97d0ed6" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", @@ -4385,15 +4385,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.94" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a42f6c679374623f295a8623adfe63d9284091245c3504bde47c17a3ce2777d9" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "web-sys" -version = "0.3.71" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44188d185b5bdcae1052d08bcbcf9091a5524038d4572cc4f4f2bb9d5554ddd9" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/versions/TELEPRESENCE_VERSION b/versions/TELEPRESENCE_VERSION index 7329e21c3b..4e2200b98e 100644 --- a/versions/TELEPRESENCE_VERSION +++ b/versions/TELEPRESENCE_VERSION @@ -1 +1 @@ -2.20.0 +2.20.1