Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update the pause image to build for arm64 and ppc64le #23697

Merged
merged 1 commit into from
Apr 14, 2016
Merged

Update the pause image to build for arm64 and ppc64le #23697

merged 1 commit into from
Apr 14, 2016
+32 −37

Conversation

luxas
Copy link
Member

@luxas luxas commented Mar 31, 2016 •
edited by zmerlynn
Loading

Fixes #22683

luxas
luxas reviewed Mar 31, 2016
View reviewed changes
build/pause/Makefile
"cd /build && apt-get update && apt-get install -y upx \
&& go get github.com/pwaller/goupx && goupx pause"
endif
ifeq ($(ARCH),arm)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hate this duplication. @zmerlynn Do you know an if [[ cond1 || cond2 ]]; then clause in make?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No: http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or

@k8s-github-robot k8s-github-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 31, 2016
@k8s-github-robot
Copy link

Labelling this PR as size/M

@k8s-bot
Copy link

k8s-bot commented Mar 31, 2016

GCE e2e build/test passed for commit 81a448a18b91f4aacdadce9075510f85e20ab656.

@k8s-github-robot
Copy link

The author of this PR is not in the whitelist for merge, can one of the admins add the 'ok-to-merge' label?

@luxas luxas force-pushed the pause_multi_arch branch from 81a448a to 89373c0 Compare April 1, 2016 04:19
@k8s-bot
Copy link

k8s-bot commented Apr 1, 2016

GCE e2e build/test passed for commit 89373c087654b8e4306d8b728bf3bb0c15bdbf8c.

@Pensu
Copy link
Contributor

Pensu commented Apr 1, 2016

@luxas Thanks lucas :). Can you please edit it to "make push ARCH=arm64 and make push ARCH=ppc64le"!

@luxas
Copy link
Member Author

luxas commented Apr 1, 2016

@Pensu Oops, copy-paste error :)
Updated the comment

@luxas luxas force-pushed the pause_multi_arch branch from 89373c0 to c214c76 Compare April 1, 2016 18:01
@k8s-bot
Copy link

k8s-bot commented Apr 1, 2016

GCE e2e build/test passed for commit c214c76.

@ikehz ikehz assigned zmerlynn and unassigned ikehz Apr 4, 2016
@ikehz
Copy link
Contributor

ikehz commented Apr 4, 2016

@zmerlynn Can you please take a look at this, since you've got context on #22686?

@zmerlynn zmerlynn added ok-to-merge lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed needs-ok-to-merge labels Apr 6, 2016
@k8s-github-robot
Copy link

@k8s-bot test this

Tests are more than 48 hours old. Re-running tests.

@k8s-github-robot
Copy link

Removing LGTM because the release note process has not been followed.
One of the following labels is required "release-note", "release-note-none", or "release-note-action-required"
Please see: https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/release-notes.md

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 6, 2016
@zmerlynn zmerlynn added lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels Apr 6, 2016
@zmerlynn
Copy link
Member

zmerlynn commented Apr 6, 2016

@luxas: Pushed.

@zmerlynn zmerlynn mentioned this pull request Apr 6, 2016
Closed
@luxas
Copy link
Member Author

luxas commented Apr 6, 2016

Many thanks @zmerlynn 😄!

@Pensu Feel free to try it out on your ppc64le machines!

@k8s-bot
Copy link

k8s-bot commented Apr 6, 2016

GCE e2e build/test passed for commit c214c76.

@k8s-bot
Copy link

k8s-bot commented Apr 6, 2016

GCE e2e build/test passed for commit c214c76.

@luxas luxas mentioned this pull request Apr 7, 2016
Closed
@k8s-github-robot
Copy link

@k8s-bot test this

Tests are more than 48 hours old. Re-running tests.

@k8s-bot
Copy link

k8s-bot commented Apr 8, 2016

GCE e2e build/test passed for commit c214c76.

@k8s-github-robot
Copy link

@k8s-bot test this

Tests are more than 48 hours old. Re-running tests.

@k8s-github-robot
Copy link

@k8s-bot test this issue: #IGNORE

Tests have been pending for 24 hours

@k8s-bot
Copy link

k8s-bot commented Apr 11, 2016

GCE e2e build/test passed for commit c214c76.

@k8s-github-robot
Copy link

@k8s-bot test this

Tests are more than 48 hours old. Re-running tests.

@k8s-bot
Copy link

k8s-bot commented Apr 13, 2016

GCE e2e build/test passed for commit c214c76.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit e363a26 into kubernetes:master Apr 14, 2016
@Pensu
Copy link
Contributor

Pensu commented Apr 14, 2016

@luxas Sorry for the delayed reply, I verified it but forgot to comment. It's working completely fine. Thanks!

@luxas
Copy link
Member Author

luxas commented Apr 14, 2016

@Pensu Please follow #23931 closely. When that one is in, one may run http://kubernetes.io/docs/getting-started-guides/docker/ and it should just work. Only s/amd64/ppc64le/ in the image name and you're done.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@zmerlynn zmerlynn

Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@luxas @k8s-github-robot @k8s-bot @Pensu @ikehz @zmerlynn @k8s-teamcity-mesosphere @googlebot @wojtek-t