Add make targets for darwin/arm64 binaries #10202

ilya-zuyev · 2021-01-21T19:46:36Z

This PR adds Makefile targets to build minikube-darwin-arm64 and e2e-darwin-arm64 binaries

develop@Devs-Mac-mini --- z/minikube ‹ilyaz/add_darwin_arm64_binary› » make minikube-darwin-arm64           
GOOS="darwin" GOARCH="arm64" \
        go build -tags "go_getter_nos3 go_getter_nogcs" -ldflags="-X k8s.io/minikube/pkg/version.version=v1.16.0 -X k8s.io/minikube/pkg/version.isoVersion=v1.16.0 -X k8s.io/minikube/pkg/version.isoPath=minikube/iso -X k8s.io/minikube/pkg/version.gitCommitID="6408c29f0a16e1fa92cf6071ab27c83f643c0c02" -X k8s.io/minikube/pkg/version.storageProvisionerVersion=v4" -a -o out/minikube-darwin-arm64 k8s.io/minikube/cmd/minikube

develop@Devs-Mac-mini --- z/minikube ‹ilyaz/add_darwin_arm64_binary› » lipo -archs out/minikube-darwin-arm64
arm64

develop@Devs-Mac-mini --- z/minikube ‹ilyaz/add_darwin_arm64_binary› » make e2e-darwin-arm64
GOOS="darwin" GOARCH="arm64" go test -ldflags="-X k8s.io/minikube/pkg/version.version=v1.16.0 -X k8s.io/minikube/pkg/version.isoVersion=v1.16.0 -X k8s.io/minikube/pkg/version.isoPath=minikube/iso -X k8s.io/minikube/pkg/version.gitCommitID="6408c29f0a16e1fa92cf6071ab27c83f643c0c02" -X k8s.io/minikube/pkg/version.storageProvisionerVersion=v4" -c k8s.io/minikube/test/integration --tags="integration go_getter_nos3 go_getter_nogcs" -o out/e2e-darwin-arm64

develop@Devs-Mac-mini --- z/minikube ‹ilyaz/add_darwin_arm64_binary› » lipo -archs out/e2e-darwin-arm64     
arm64

Also this PR adds a rule for "fat" darwin binary minikube-darwin containing both x86 and arm64 sections

develop@Devs-Mac-mini --- z/minikube ‹ilyaz/add_darwin_arm64_binary› » make minikube-darwin                                                                 
GOOS="darwin" GOARCH="amd64" \
        go build -tags "go_getter_nos3 go_getter_nogcs" -ldflags="-X k8s.io/minikube/pkg/version.version=v1.16.0 -X k8s.io/minikube/pkg/version.isoVersion=v1.16.0 -X k8s.io/minikube/pkg/version.isoPath=minikube/iso -X k8s.io/minikube/pkg/version.gitCommitID="855d55e4db2d8fdad36f982d36cb7b499260f944" -X k8s.io/minikube/pkg/version.storageProvisionerVersion=v4" -a -o out/minikube-darwin-amd64 k8s.io/minikube/cmd/minikube
GOOS="darwin" GOARCH="arm64" \
        go build -tags "go_getter_nos3 go_getter_nogcs" -ldflags="-X k8s.io/minikube/pkg/version.version=v1.16.0 -X k8s.io/minikube/pkg/version.isoVersion=v1.16.0 -X k8s.io/minikube/pkg/version.isoPath=minikube/iso -X k8s.io/minikube/pkg/version.gitCommitID="855d55e4db2d8fdad36f982d36cb7b499260f944" -X k8s.io/minikube/pkg/version.storageProvisionerVersion=v4" -a -o out/minikube-darwin-arm64 k8s.io/minikube/cmd/minikube
lipo -create out/minikube-darwin-amd64 out/minikube-darwin-arm64 -output out/minikube-darwin
develop@Devs-Mac-mini --- z/minikube ‹ilyaz/add_darwin_arm64_binary› » 

develop@Devs-Mac-mini --- z/minikube ‹ilyaz/add_darwin_arm64_binary› » lipo -archs out/minikube-darwin
x86_64 arm64

medyagh · 2021-01-21T20:35:55Z

Makefile

@@ -219,7 +228,8 @@ endif
 .PHONY: e2e-linux-amd64 e2e-linux-arm64 e2e-darwin-amd64 e2e-windows-amd64.exe
 e2e-linux-amd64: out/e2e-linux-amd64 ## Execute end-to-end testing for Linux 64bit
 e2e-linux-arm64: out/e2e-linux-arm64 ## Execute end-to-end testing for Linux ARM 64bit
-e2e-darwin-amd64: out/e2e-darwin-amd64 ## Execute end-to-end testing for Darwin 64bit
+e2e-darwin-amd64: out/e2e-darwin-amd64 ## Execute end-to-end testing for Darwin x86 64bit


lets fix the comment for all e2e, I think the right comment should be

"build end2end binary for ..." (it doesnt execute the test)

medyagh · 2021-01-21T20:36:52Z

Makefile

 minikube-windows-amd64.exe: out/minikube-windows-amd64.exe ## Build Minikube for Windows 64bit

+out/minikube-darwin: out/minikube-darwin-amd64 out/minikube-darwin-arm64
+	lipo -create $^ -output $@


what is this lipo for ?

it's a standard darwin to work with executables.
https://ss64.com/osx/lipo.html
Here it's used to repack binaries for amd64 and arm64 into single executable file

does this affect the binary size ? and would it not work without it ?

It's a pun on "fat binaries", like https://en.wikipedia.org/wiki/Liposuction
(they later got renamed to "universal binaries", making it incomprehensible)

There is actually a similar project for Linux: https://icculus.org/fatelf/
But it never caught on, I guess not the same amount of closed binaries ?

i.e. it makes the "files to download" list shorter, but the binaries bigger (twice)

if we did that for all of kubernetes (all arch), it would be 5x the current size

got it. removed

afbjorklund · 2021-01-24T08:59:20Z

Makefile

 minikube-windows-amd64.exe: out/minikube-windows-amd64.exe ## Build Minikube for Windows 64bit

+out/minikube-darwin: out/minikube-darwin-amd64 out/minikube-darwin-arm64
+	lipo -create $^ -output $@


It's a pun on "fat binaries", like https://en.wikipedia.org/wiki/Liposuction
(they later got renamed to "universal binaries", making it incomprehensible)

There is actually a similar project for Linux: https://icculus.org/fatelf/
But it never caught on, I guess not the same amount of closed binaries ?

afbjorklund · 2021-01-24T09:04:31Z

@ilya-zuyev :
I think you need to remove this new target from "make e2e-cross", until we have upgraded to go1.16 ?

# k8s.io/minikube/cmd/minikube
/usr/local/go/pkg/tool/linux_amd64/link: running gcc failed: exit status 1
/tmp/go-link-870443438/go.o: file not recognized: file format not recognized
collect2: error: ld returned 1 exit status

Note: it has not been released yet, see https://golang.org/doc/devel/release.html

See also https://github.com/kubernetes/kubernetes/blob/master/build/build-image/cross/VERSION

afbjorklund · 2021-01-24T09:07:30Z

Makefile

@@ -378,7 +388,7 @@ darwin: minikube-darwin-amd64 ## Build minikube for Darwin 64bit
 linux: minikube-linux-amd64 ## Build minikube for Linux 64bit

 .PHONY: e2e-cross
-e2e-cross: e2e-linux-amd64 e2e-linux-arm64 e2e-darwin-amd64 e2e-windows-amd64.exe ## End-to-end cross test
+e2e-cross: e2e-linux-amd64 e2e-linux-arm64 e2e-darwin-amd64 e2e-darwin-arm64 e2e-windows-amd64.exe ## End-to-end cross test


This fails to build, so please revert this line.

oops, was testing on go1.16 beta. removed. thanks!

ilya-zuyev · 2021-01-26T22:49:52Z

/ok-to-test

medyagh · 2021-01-26T23:15:21Z

hack/jenkins/release_build_and_upload.sh

@@ -43,9 +43,10 @@ echo "Verifying ISO exists ..."
 make verify-iso

 # Build and upload
-env BUILD_IN_DOCKER=y \
+env BUILD_IN_DOCKER=y BUILD_IMAGE=golang:1.16beta1-buster \


since we change in Makefile no need to change both places. so later we can revert only on file

…m64_binary' into ilyaz/add_darwin_arm64_binary

k8s-ci-robot · 2021-01-27T22:40:40Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afbjorklund, ilya-zuyev, medyagh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [afbjorklund,medyagh]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Add darwin-arm64 Makefile targets

6408c29

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 21, 2021

k8s-ci-robot requested review from afbjorklund and josedonizetti January 21, 2021 19:46

Add Makefile target for building fat darwin binary (both amd64+arm64)

855d55e

k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 21, 2021

medyagh requested changes Jan 21, 2021

View reviewed changes

ilya-zuyev added 2 commits January 21, 2021 23:04

Fix Makefile comments for e2e targets

606335a

Fix Makefile comments for e2e targets

5e371df

afbjorklund approved these changes Jan 24, 2021

View reviewed changes

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 24, 2021

afbjorklund requested changes Jan 24, 2021

View reviewed changes

k8s-ci-robot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 24, 2021

ilya-zuyev added 3 commits January 25, 2021 10:40

remove target for universal darwin binary

2f18e5a

Fix build

7cc2874

remove unused .phony targets

344e2fd

afbjorklund approved these changes Jan 25, 2021

View reviewed changes

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 25, 2021

ilya-zuyev mentioned this pull request Jan 25, 2021

Add apple M1 to build scripts & release process #10116

Closed

medyagh approved these changes Jan 25, 2021

View reviewed changes

update jenkins build scripts

eaf4f96

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 26, 2021

update jenkins build scripts

ef34832

k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 26, 2021

Use test build_image

6b29e26

k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Jan 26, 2021

Remove test script

7850e18

k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 26, 2021

Trigger build

2b2dbfb

medyagh reviewed Jan 26, 2021

View reviewed changes

ilya-zuyev added 20 commits January 26, 2021 15:31

Add minikube-darwin-arm64 to build script

2f0d3d6

Merge remote-tracking branch 'refs/remotes/origin/ilyaz/add_darwin_ar…

f863539

…m64_binary' into ilyaz/add_darwin_arm64_binary

Build DEB and RPM packages in minikube_cross_build_and_upload.sh

686bb48

Fix merge conflict

adaf96d

use dev/rpm version from makefile

d01642b

do not set BUILD_IMAGE in hack/jenkins/release_build_and_upload.sh

d621609

Trigger build

200946f

Trigger build

5efe2ea

Trigger build

9159474

Trigger build

e12283e

Merge branch 'master' into ilyaz/add_darwin_arm64_binary

4b5163e

Fix RPM_VERSION

58ee238

Add deb_version_base make target

01170c6

Add deb_version_base make target

faa1706

Fix deb_version in build script

ddb5cc0

add deb make target

8c5e64c

fix deb_version issue

5050670

fix deb_version issue

080cf3d

fix deb_version issue

2320d7c

Remove debug code

6d8c2b9

medyagh approved these changes Jan 27, 2021

View reviewed changes

medyagh merged commit fc330cb into kubernetes:master Jan 27, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add make targets for darwin/arm64 binaries #10202

Add make targets for darwin/arm64 binaries #10202

ilya-zuyev commented Jan 21, 2021 •

edited

Loading

medyagh Jan 21, 2021

ilya-zuyev Jan 22, 2021

medyagh Jan 21, 2021

ilya-zuyev Jan 22, 2021

medyagh Jan 23, 2021

afbjorklund Jan 24, 2021

afbjorklund Jan 24, 2021

ilya-zuyev Jan 25, 2021

afbjorklund Jan 24, 2021

afbjorklund commented Jan 24, 2021 •

edited

Loading

afbjorklund Jan 24, 2021

ilya-zuyev Jan 25, 2021

ilya-zuyev commented Jan 26, 2021

medyagh Jan 26, 2021

k8s-ci-robot commented Jan 27, 2021

Add make targets for darwin/arm64 binaries #10202

Add make targets for darwin/arm64 binaries #10202

Conversation

ilya-zuyev commented Jan 21, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

afbjorklund commented Jan 24, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ilya-zuyev commented Jan 26, 2021

Choose a reason for hiding this comment

k8s-ci-robot commented Jan 27, 2021

ilya-zuyev commented Jan 21, 2021 •

edited

Loading

afbjorklund commented Jan 24, 2021 •

edited

Loading