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: Move pod infra container image setting to dockertools. #6634

Merged
merged 1 commit into from Apr 9, 2015

Conversation

Projects
None yet
3 participants
@yifan-gu
Member

yifan-gu commented Apr 9, 2015

Currently, when kubelet starts, it uses the pod infra container image flag to determine which image to use for the pod infra container, and store it in kubelet:
https://github.com/GoogleCloudPlatform/kubernetes/blob/master/pkg/kubelet/kubelet.go#L212
The default value is also defined in kubelet.go: https://github.com/GoogleCloudPlatform/kubernetes/blob/master/pkg/kubelet/kubelet.go#L212

Since pod infra container is docker specific, so here I moved the default value and the setting to dockertools.

@vmarmol @yujuhong

@googlebot googlebot added the cla: yes label Apr 9, 2015

@vmarmol vmarmol self-assigned this Apr 9, 2015

@@ -41,13 +41,16 @@ import (
type DockerManager struct {
client DockerInterface
recorder record.EventRecorder
// TODO(yifan): PodInfraContainerImage can be unexported once
// we move createPodInfraContainer into dockertools.
PodInfraContainerImage string

This comment has been minimized.

@vmarmol

vmarmol Apr 9, 2015

Contributor

nit: make private

@vmarmol

vmarmol Apr 9, 2015

Contributor

nit: make private

This comment has been minimized.

@vmarmol

vmarmol Apr 9, 2015

Contributor

Ah I see, nvm :)

@vmarmol

vmarmol Apr 9, 2015

Contributor

Ah I see, nvm :)

@vmarmol

This comment has been minimized.

Show comment
Hide comment
@vmarmol

vmarmol Apr 9, 2015

Contributor

LGTM, thanks @yifan-gu!

Contributor

vmarmol commented Apr 9, 2015

LGTM, thanks @yifan-gu!

vmarmol added a commit that referenced this pull request Apr 9, 2015

Merge pull request #6634 from yifan-gu/pod_infra_img
kubelet: Move pod infra container image setting to dockertools.

@vmarmol vmarmol merged commit 6836b52 into kubernetes:master Apr 9, 2015

3 of 4 checks passed

Shippable Builds in progress on Shippable
Details
cla/google All necessary CLAs are signed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage decreased (-0.02%) to 53.98%
Details

@yifan-gu yifan-gu deleted the yifan-gu:pod_infra_img branch May 7, 2015

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