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.
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
kubelet: Introduce PodInfraContainerChanged(). #6608
Conversation
DockerPrefix = "docker://" | ||
PodInfraContainerName = leaky.PodInfraContainerName | ||
DockerPrefix = "docker://" | ||
PodInfraContainerImage = "gcr.io/google_containers/pause:0.8.0" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is a flag for this, we should use it instead of this (the old version was unused I believe).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Gotcha
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@vmarmol I have checked about this. The flag is stored in kubelet, I think we should move it to the DockManager?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SGTM, the PR was merged :)
4cbd513
to
de82552
Compare
@vmarmol Hmm, I found by comparing the container directly, it's making the fake docker much complex since I need to construct a valid |
@yifan-gu I'm fine going the has route since we use that today, but it just seems out of place when we do equals other places today. |
@vmarmol Could you point some places where we do equals please? I didn't find one, maybe it's differently and better than me. |
da74906
to
e1299f6
Compare
@vmarmol I see. Ideally this can be done in the future when we can reconstruct api.Container from the container runtime. BTW, I fixed all the tests, to make it easier for you to review, I put those in the second commits :) I am running e2e now to see if this change works right. |
"list", // Get pod status. | ||
"create", "start", "inspect_container", // Create pod infra container. | ||
"create", "start", // Create container. | ||
"list", "inspect_container", "inspect_container"}) // Get pod status. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is classy newline use; make the comments justified at the same position?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(and everywhere else) @yifan-gu
Is |
@pmorie I don't think so, it's docker specific IMO, rkt doesn't need a pod infra container. |
Oops, got many e2e failures.
|
Got a log of connection refused error, such as
Investigating |
The containers on master are keeping restarting... Sounds like a bug. |
0b20ff7
to
6063f3a
Compare
Got 2 failures now:
|
ddcd5da
to
7563bbe
Compare
Fixed, it's because the target pools are not cleared.
|
ba7258c
to
aca5d8b
Compare
@vmarmol I think this is ready for another review? |
Awesome, I'll take a look today @yifan-gu |
@vmarmol Thank you! FYI the 1st commit is the change made to source, 2nd is updating tests. I am running e2e again :) |
Have run for twice again, one passed all tests, one got a failure which I think is a known issue #6424
|
Outside of that one change (and the needed rebase), this looks good :) |
This functions computes in ahead whether we need to restart the pod infra container.
Update tests.
@vmarmol Rebased and ran e2e again. Looks good:
|
LGTM, thanks for the diligence @yifan-gu! Will merge once the CIs go green. |
@vmarmol You're very welcome! I think cleaning up the sync logic might have potential to break the e2e, so I am trying to be more careful. I will keep an eye on that if any stuff fails in the future. |
Clean GCE e2e run? It's a miracle. On Mon, Apr 13, 2015 at 9:22 PM, Yifan Gu notifications@github.com wrote:
|
kubelet: Introduce PodInfraContainerChanged().
@vmarmol @yujuhong
This new function computes in ahead whether we need to restart the pod
infra container.
Splitted from #6169 to enable smoother review.
Tests are broken, fixing...
/cc @jonboulle