github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #97743 from dims/support-m1-macbook-darwin/arm64-as-client

Browse Source 
Support M1 MacBooks darwin/arm64 on the client-side
This commit is contained in:
Kubernetes Prow Robot 2021-03-04 04:18:09 -08:00 committed by GitHub
commit 2e39df89ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hack/lib/golang.sh
View File

@ -49,6 +49,7 @@ readonly KUBE_SUPPORTED_CLIENT_PLATFORMS=(
linux/s390x linux/s390x
linux/ppc64le linux/ppc64le
darwin/amd64 darwin/amd64
darwin/arm64
windows/amd64 windows/amd64
windows/386 windows/386
) )
@ -62,6 +63,7 @@ readonly KUBE_SUPPORTED_TEST_PLATFORMS=(
linux/s390x linux/s390x
linux/ppc64le linux/ppc64le
darwin/amd64 darwin/amd64
darwin/arm64
windows/amd64 windows/amd64
) )
@ -206,25 +208,30 @@ kube::golang::setup_platforms() {
readonly KUBE_CLIENT_PLATFORMS readonly KUBE_CLIENT_PLATFORMS
elif [[ "${KUBE_FASTBUILD:-}" == "true" ]]; then elif [[ "${KUBE_FASTBUILD:-}" == "true" ]]; then
KUBE_SERVER_PLATFORMS=(linux/amd64) host_arch=$(kube::util::host_arch)
if [[ "${host_arch}" != "amd64" && "${host_arch}" != "arm64" ]]; then
# on any platform other than amd64 and arm64, we just default to amd64
host_arch="amd64"
fi
KUBE_SERVER_PLATFORMS=("linux/${host_arch}")
readonly KUBE_SERVER_PLATFORMS readonly KUBE_SERVER_PLATFORMS
KUBE_NODE_PLATFORMS=(linux/amd64) KUBE_NODE_PLATFORMS=("linux/${host_arch}")
readonly KUBE_NODE_PLATFORMS readonly KUBE_NODE_PLATFORMS
if [[ "${KUBE_BUILDER_OS:-}" == "darwin"* ]]; then if [[ "${KUBE_BUILDER_OS:-}" == "darwin"* ]]; then
KUBE_TEST_PLATFORMS=( KUBE_TEST_PLATFORMS=(
darwin/amd64 "darwin/${host_arch}"
linux/amd64 "linux/${host_arch}"
) )
readonly KUBE_TEST_PLATFORMS readonly KUBE_TEST_PLATFORMS
KUBE_CLIENT_PLATFORMS=( KUBE_CLIENT_PLATFORMS=(
darwin/amd64 "darwin/${host_arch}"
linux/amd64 "linux/${host_arch}"
) )
readonly KUBE_CLIENT_PLATFORMS readonly KUBE_CLIENT_PLATFORMS
else else
KUBE_TEST_PLATFORMS=(linux/amd64) KUBE_TEST_PLATFORMS=("linux/${host_arch}")
readonly KUBE_TEST_PLATFORMS readonly KUBE_TEST_PLATFORMS
KUBE_CLIENT_PLATFORMS=(linux/amd64) KUBE_CLIENT_PLATFORMS=("linux/${host_arch}")
readonly KUBE_CLIENT_PLATFORMS readonly KUBE_CLIENT_PLATFORMS
fi fi
else else

8
test/typecheck/main.go
View File

@ -48,10 +48,10 @@ var (
// interesting OS-based errors happen earlier. // interesting OS-based errors happen earlier.
crossPlatforms = []string{ crossPlatforms = []string{
"linux/amd64", "windows/386", "linux/amd64", "windows/386",
"darwin/amd64", "linux/arm", "darwin/amd64", "darwin/arm64",
"linux/386", "windows/amd64", "linux/arm", "linux/386",
"linux/arm64", "linux/ppc64le", "windows/amd64", "linux/arm64",
"linux/s390x", "linux/ppc64le", "linux/s390x",
} }
// directories we always ignore // directories we always ignore