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

Make the etcd image cross-platform #19216

Merged
merged 1 commit into from
Jan 7, 2016
Merged

Make the etcd image cross-platform #19216

merged 1 commit into from
Jan 7, 2016
+102 −22

Conversation

luxas
Copy link
Member

@luxas luxas commented Dec 31, 2015

ARM tracking issue: #17981

If building for amd64, download the release as earlier.
If building for another arch, cross-compile etcd statically.

Harmonize the Makefile with hyperkube Makefile

This patch fixes partially this issue: #19185
Usage: ARCH=ppc64le BASEIMAGE=scratch make
Of course, if you have a ppc64le busybox image, use that instead.
One caveat, etcd doesn't compile on ppc64le right now:

# github.com/coreos/etcd/Godeps/_workspace/src/github.com/boltdb/bolt
gopath/src/github.com/coreos/etcd/Godeps/_workspace/src/github.com/boltdb/bolt/db.go:85: undefined: maxMapSize
gopath/src/github.com/coreos/etcd/Godeps/_workspace/src/github.com/boltdb/bolt/db.go:85: invalid array bound maxMapSize

But when that is fixed, ppc64le is also supported.

@brendandburns @dchen1107 @ArtfulCoder @thockin @fgrzadkowski @qq511700505

@k8s-bot
Copy link

k8s-bot commented Dec 31, 2015

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

If this message is too spammy, please complain to ixdy.

@k8s-github-robot
Copy link

Labelling this PR as size/L

@k8s-github-robot k8s-github-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 31, 2015
@k8s-bot
Copy link

k8s-bot commented Dec 31, 2015

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

If this message is too spammy, please complain to ixdy.

@roberthbailey
Copy link
Contributor

ok to test

@k8s-bot
Copy link

k8s-bot commented Jan 1, 2016

GCE e2e test build/test passed for commit c11d06d901e7e5f30f38faff8b2a9cb080b8e21f.

@k8s-bot
Copy link

k8s-bot commented Jan 1, 2016

GCE e2e build/test failed for commit c11d06d901e7e5f30f38faff8b2a9cb080b8e21f.

@luxas luxas mentioned this pull request Jan 4, 2016
Closed
brendandburns
brendandburns reviewed Jan 4, 2016
View reviewed changes
cluster/images/etcd/.gitignore
@@ -1,4 +0,0 @@
etcd
Copy link
Contributor

Choose a reason for hiding this comment

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

why are you deleting this file?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's simply not needed. No files will be stored there.

@brendandburns
Copy link
Contributor

Minor stuff.

@luxas luxas force-pushed the etcd_cross_platform branch from c11d06d to c77d6f7 Compare January 5, 2016 08:52
@luxas
Copy link
Member Author

luxas commented Jan 5, 2016

Fixed. Here is a quick test:

$ sudo make
-> gcr.io/google_containers/etcd-amd64:2.2.1
-> gcr.io/google_containers/etcd:2.2.1

$ sudo ARCH=arm make
-> gcr.io/google_containers/etcd-arm:2.2.1

# Tested on a Pi 1 (armv6)
$ docker run -it gcr.io/google_containers/etcd-arm:2.2.1 /bin/sh
$ etcdctl
OK
$ etcd
OK

# Tested on a normal amd64 machine
$ docker run -it gcr.io/google_containers/etcd-amd64:2.2.1 /bin/sh
$ etcdctl
OK
$ etcd
OK

@k8s-bot
Copy link

k8s-bot commented Jan 5, 2016

GCE e2e test build/test passed for commit c77d6f7.

@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
Copy link
Member Author

luxas commented Jan 5, 2016

All green, ready to merge?

@luxas luxas mentioned this pull request Jan 7, 2016
Closed
17 tasks
@brendandburns brendandburns added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 7, 2016
@brendandburns
Copy link
Contributor

LGTM and ready to merge. Thanks @luxas

@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 Jan 7, 2016

GCE e2e test build/test passed for commit c77d6f7.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

k8s-github-robot pushed a commit that referenced this pull request Jan 7, 2016
Merge pull request #19216 from luxas/etcd_cross_platform
c156835 
Auto commit by PR queue bot
@k8s-github-robot k8s-github-robot merged commit c156835 into kubernetes:master Jan 7, 2016
@luxas luxas mentioned this pull request Jan 7, 2016
Merged
@luxas
Copy link
Member Author

luxas commented Jan 17, 2016

@thockin @brendandburns Could you push the arm image to gcr.io, please?

@thockin
Copy link
Member

thockin commented Jan 28, 2016

I built and pushed etcd-arm and etcd-amd64, both tagged as :2.2.1

@luxas
Copy link
Member Author

luxas commented Jan 29, 2016

Whohoo! Thanks @thockin

@luxas luxas mentioned this pull request Jan 31, 2016
Open
@luxas luxas mentioned this pull request Mar 27, 2016
Merged
k8s-github-robot pushed a commit that referenced this pull request Apr 11, 2016
Merge pull request #19376 from luxas/dns_cross_platform
78dc9c7 
Automatic merge from submit-queue

Make kube2sky and skydns docker images cross-platform

ARM tracking issue: #17981
Continues on: #19216

Make it possible to create `kube2sky` and `skydns` docker images for ARM and other architectures too
Build in a container, so `golang` isn't a dependency
I've preserved the original default behaviour:
 - `skydns`: It just compiles with go on host
 - `kube2sky`: Build an image

@brendandburns @dchen1107 @ArtfulCoder @thockin @fgrzadkowski
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@brendandburns brendandburns

Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@luxas @k8s-bot @k8s-github-robot @roberthbailey @brendandburns @thockin @k8s-teamcity-mesosphere @googlebot