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

MESOS: Decouple executor and kubelet #13036

Merged
merged 12 commits into from Oct 10, 2015
Merged

MESOS: Decouple executor and kubelet #13036

merged 12 commits into from Oct 10, 2015

Conversation

sttts
Copy link
Contributor

@sttts sttts commented Aug 21, 2015

This patch reduces the dependencies of the executor from the kubelet. This makes it possible to launch the kubelet after the executor.

This PR is the pre-requisite for

All non-mesos changes are moved into #14415

@sttts sttts changed the title Decouple executor and kubelet WIP/MESOS: Decouple executor and kubelet Aug 21, 2015
@k8s-bot
Copy link

k8s-bot commented Aug 21, 2015

GCE e2e build/test passed for commit 7c00b4a948fd3529055d8c3c63c0ba56651e6694.

@k8s-bot
Copy link

k8s-bot commented Aug 21, 2015

GCE e2e build/test passed for commit 2453fa90905c75918a79511f7277a60a946e2fe6.

@k8s-bot
Copy link

k8s-bot commented Aug 21, 2015

GCE e2e build/test passed for commit c0975949369eee74b729e6e7544bc72f91f3e166.

@bgrant0607
Copy link
Member

cc @cjcullen @a-robinson re. cloudprovider
cc @dchen1107 re. kubelet
cc @davidopp re. mesos

@k8s-bot
Copy link

k8s-bot commented Aug 22, 2015

GCE e2e build/test passed for commit df25a5cd293f2485d87abd318f99469122902984.

@k8s-bot
Copy link

k8s-bot commented Aug 22, 2015

GCE e2e build/test passed for commit 5c9247f2e210bc3345e93ea8b44da6934eb64843.

@sttts sttts force-pushed the decouple-executor-and-kubelet branch 2 times, most recently from 5205915 to ac7cdb8 Compare August 24, 2015 11:35
@k8s-bot
Copy link

k8s-bot commented Aug 24, 2015

GCE e2e build/test passed for commit 52059153399da36cedb3ef37046ac263749c443a.

@k8s-bot
Copy link

k8s-bot commented Aug 24, 2015

GCE e2e build/test passed for commit ac7cdb8e1f8893882e3662b0ce5ed13a5ad42256.

@sttts sttts force-pushed the decouple-executor-and-kubelet branch from ac7cdb8 to 4f0d8e7 Compare August 24, 2015 12:33
@k8s-bot
Copy link

k8s-bot commented Aug 24, 2015

GCE e2e build/test failed for commit 4f0d8e76604c297d7e5946af0e807e847dbcb845.

@k8s-bot
Copy link

k8s-bot commented Aug 24, 2015

GCE e2e build/test passed for commit abc700b28634ece7f68ed45fdac6ef8a4cfe4085.

@sttts sttts mentioned this pull request Aug 24, 2015
Closed
@sttts
Copy link
Contributor Author

sttts commented Aug 24, 2015

@jdef this one would be ready for a high-level review. It certainly needs some clean up here and there.

jdef
jdef reviewed Aug 24, 2015
View reviewed changes
cluster/mesos/docker/docker-compose.yml
command: ~
environment:
- MESOS_HOSTNAME=mesosslave1
Copy link
Contributor

Choose a reason for hiding this comment

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

is this because the new dind image supports this variable?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, it was supported before, but we did not explicitly pass it to the kubelet (only indirectly as hostname). In production environment one might have real DNS names for slaves, not IPs. That's why I added it here.

@sttts
Consolidate executor driver initialization code
93ae257
@sttts
Decouple executor initialization from kubelet
a60df40 
This patch reduces the dependencies of the executor from the kubelet. This
makes it possible launch the kubelet after the executor.

This considerably reduces the complexity of the startup code.

Moreover, this work is a requirement to use a standalone kubelet some day.
@sttts
Decouple startup of executor and kubelet
dd5bafd
@sttts
Re-use KubeletServer.KubeletConfig and KubeletServer.Run
0feb1bc
@sttts
Simplify executorKubelet decorator and move to kubelet.go
4ec7031 
- simplify
- rename kubeletExecutor -> executorKubelet
- move executorKubelet code into kubelet.go
- remove duplicated executorKubelet.ListenAndServe
- fix executorKubelet.Run comment
@sttts
Re-use CreateAndInitKubelet
d74950c
@sttts
Set static pods dir to 0750 instead of world readible 0755
b629278
@sttts
Replace all executor_test timeouts by util.ForeverTestTimeout
0d8384c
@sttts sttts force-pushed the decouple-executor-and-kubelet branch from 3712bee to 0d8384c Compare October 10, 2015 09:54
@sttts
Copy link
Contributor Author

sttts commented Oct 10, 2015

Rebased to lastets master, hopefully with more stable e2e tests.

@sttts sttts added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Oct 10, 2015
@k8s-bot
Copy link

k8s-bot commented Oct 10, 2015

GCE e2e test build/test passed for commit 0d8384c.

@sttts
Copy link
Contributor Author

sttts commented Oct 10, 2015

@k8s-bot test this please

@k8s-bot
Copy link

k8s-bot commented Oct 10, 2015

GCE e2e test build/test passed for commit 0d8384c.

@mikedanese
Copy link
Member

The PR builder doesn't test these changes since they are only in contrib so adding e2e-not-required

@k8s-github-robot
Copy link

Automatic merge from submit-queue

k8s-github-robot pushed a commit that referenced this pull request Oct 10, 2015
Merge pull request #13036 from mesosphere/decouple-executor-and-kubelet
dfbad56 
Auto commit by PR queue bot
@k8s-github-robot k8s-github-robot merged commit dfbad56 into kubernetes:master Oct 10, 2015
@sttts sttts mentioned this pull request Nov 5, 2015
Closed
34 tasks
sttts pushed a commit to mesosphere-backup/kubernetes that referenced this pull request Nov 9, 2015
@sttts
Merge pull request kubernetes#13036 from mesosphere/decouple-executor…
8cab699 
…-and-kubelet

Auto commit by PR queue bot
@sttts sttts deleted the decouple-executor-and-kubelet branch November 18, 2015 10:28
sttts pushed a commit to mesosphere-backup/kubernetes that referenced this pull request Nov 30, 2015
@sttts
Merge pull request kubernetes#13036 from mesosphere/decouple-executor…
4681c83 
…-and-kubelet

Auto commit by PR queue bot
RichieEscarez pushed a commit to RichieEscarez/kubernetes that referenced this pull request Dec 4, 2015
@sttts @RichieEscarez
Make kubelet builder customizable
a9315f6 
This is the preparation to remove a lot of duplicated code for kubelet
initialization in kubernetes#13036.
s-urbaniak pushed a commit to mesosphere-backup/kubernetes that referenced this pull request Dec 10, 2015
Merge pull request kubernetes#13036 from mesosphere/decouple-executor…
71cdd20 
…-and-kubelet

Auto commit by PR queue bot
jdef pushed a commit to mesosphere-backup/kubernetes that referenced this pull request Jan 25, 2016
Merge pull request kubernetes#13036 from mesosphere/decouple-executor…
b25b417 
…-and-kubelet

Auto commit by PR queue bot
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdef jdef

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

Successfully merging this pull request may close these issues.

None yet
10 participants
@sttts @k8s-bot @bgrant0607 @k8s-github-robot @jdef @s-urbaniak @mikedanese @k8s-teamcity-mesosphere @googlebot @davidopp