Skip to content

Conversation

luxas
Copy link
Member

@luxas luxas commented Dec 18, 2015

Update docker-multinode in the same manner as docker has been updated by @fgrzadkowski
Also run kube-proxy in a static pod on master and some formatting.

Related to #17981.
Partially depends on: #17213 (for serviceAccount functionality)

After this has been merged, we can go forward with supporting ARM images OOTB.

Assign to: @brendandburns
@dalanlan @fgrzadkowski @resouer

@k8s-bot
Copy link

k8s-bot commented Dec 18, 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.

1 similar comment
@k8s-bot
Copy link

k8s-bot commented Dec 18, 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 18, 2015
@luxas luxas force-pushed the update_master_multi branch from b372ab6 to 8799c3c Compare December 18, 2015 19:30
@@ -39,7 +39,7 @@ interested in just starting to explore Kubernetes, we recommend that you start t

_Note_:
There is a [bug](https://github.com/docker/docker/issues/14106) in Docker 1.7.0 that prevents this from working correctly.
Copy link
Contributor

Choose a reason for hiding this comment

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

May as well just delete this and say: "expects Docker 1.8.x or higher..."

@brendandburns
Copy link
Contributor

Some minor stuff, otherwise LGTM.

@luxas luxas force-pushed the update_master_multi branch from 8799c3c to d09aff5 Compare December 19, 2015 13:54
@luxas
Copy link
Member Author

luxas commented Dec 19, 2015

Ping @brendandburns

1. You need a machine with docker of right version installed.
The only thing you need is a machine with **Docker 1.8.x or higher**

It might work with older docker versions, but that isn't supported.
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm sorry but is this strictly required? I'm still working on docker 1.7.1 and it fits me well.
Maybe it's worth keeping the issue thing and also say something like "we prefer..., but..." :-)

Copy link
Member Author

Choose a reason for hiding this comment

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

@dalanlan Quite funny, I just edited it on request by @brendandburns

I think we should encourage users to use k8s with latest stable docker if possible.
Not everyone will use docker 1.8.x and higher, and as you say, 1.7.1 works well, so therefore I added that it might work with older versions

But I don't know how Kubernetes Docker policy is set up, if docker 1.7.1 is supported by k8s 1.1.x

Copy link
Contributor

Choose a reason for hiding this comment

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

AFAIU the bug referenced here affects users only if they run docker daemon differently. We don't do this in our guide. I'd either just delete this requirement at all, or move it to a separate section Troubleshooting. WDYT?

Copy link
Member Author

Choose a reason for hiding this comment

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

We do use docker daemon differently. The issue is about combining docker -d --bridge=none and docker run --net=host.

We do this for etcd and flannel, where they have --net=host and docker-bootstrap has --bridge=none.

I don't really know what to do to make everyone happy.
I assume @brendandburns wants docker >= 1.8.x because he said it, but should I make it like this?

It should work with older docker versions (like 1.7.1), but that isn't fully supported.

Copy link
Contributor

Choose a reason for hiding this comment

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

Good point :) Why not require version 1.7.1+?

Copy link
Member Author

Choose a reason for hiding this comment

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

@brendandburns Which version do you want to support?

Is the updated text OK?

Copy link
Contributor

Choose a reason for hiding this comment

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

Kubernetes itself doesn't require docker 1.8. If we know that this particular setup will not work with 1.7.0, then believe we should just write "1.7.1+".

Copy link
Member Author

Choose a reason for hiding this comment

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

Works fine for me

@luxas
Copy link
Member Author

luxas commented Dec 29, 2015

@brendandburns @fgrzadkowski @dalanlan Updated.
No dependency on sudo anymore and it's easy to specify which version one should use.
Required docker 1.7.1 or higher as we discussed.
Ready to merge?

@luxas
Copy link
Member Author

luxas commented Jan 2, 2016

Ping @brendandburns @fgrzadkowski
There are two pending PRs that more or less depends on this one.

@@ -74,10 +70,13 @@ This pattern is necessary because the `flannel` daemon is responsible for settin
all of the Docker containers created by Kubernetes. To achieve this, it must run outside of the _main_ Docker daemon. However,
it is still useful to use containers for deployment and management, so we create a simpler _bootstrap_ daemon to achieve this.

You can specify k8s version on very node before install:
You can specify the version on very node before install:
Copy link
Contributor

Choose a reason for hiding this comment

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

s/very/every/

@brendandburns
Copy link
Contributor

Basically LGTM, one little nit.

@luxas luxas force-pushed the update_master_multi branch from 4cf4b9b to 25dfd26 Compare January 4, 2016 21:56
@luxas
Copy link
Member Author

luxas commented Jan 4, 2016

Fixed

@brendandburns
Copy link
Contributor

LGTM, you need to run ./hack/update-generated-docs.sh (sorry)

thanks
--brendan

@brendandburns brendandburns added lgtm "Looks good to me", indicates that a PR is ready to be merged. e2e-not-required labels Jan 7, 2016
@k8s-github-robot
Copy link

@k8s-bot ok to test
@k8s-bot test this

pr builder appears to be missing, activating due to 'lgtm' label.

@k8s-bot
Copy link

k8s-bot commented Jan 7, 2016

GCE e2e test build/test passed for commit 25dfd267bb2ed45ea6e5a5ed56e93999ec9e38d4.

@luxas
Copy link
Member Author

luxas commented Jan 8, 2016

@brendandburns @fgrzadkowski @wojtek-t @k8s-bot Unit test this please

@gmarek
Copy link
Contributor

gmarek commented Jan 11, 2016

@luxas please run hack/update-generated-docs.sh

@luxas luxas force-pushed the update_master_multi branch from 25dfd26 to 7d49744 Compare January 11, 2016 14:51
@k8s-github-robot
Copy link

PR changed after LGTM, removing LGTM.

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 11, 2016
@luxas
Copy link
Member Author

luxas commented Jan 11, 2016

@gmarek @brendandburns I ran hack/update-generated-docs.sh now. It just added two empty lines.
OK to merge now?

@gmarek
Copy link
Contributor

gmarek commented Jan 11, 2016

Let's wait for tests.

@gmarek gmarek added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 11, 2016
@k8s-bot
Copy link

k8s-bot commented Jan 11, 2016

GCE e2e test build/test passed for commit 7d49744.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

k8s-github-robot pushed a commit that referenced this pull request Jan 12, 2016
@k8s-github-robot k8s-github-robot merged commit d246ed0 into kubernetes:master Jan 12, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

10 participants