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.

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: replace DockerManager with the Runtime interface #7674

Merged
merged 1 commit into from
May 4, 2015

Conversation

yujuhong
Copy link
Contributor

@yujuhong yujuhong commented May 2, 2015

This change instructs kubelet to switch to using the Runtime interface. In order
to do it, the change moves the Prober instantiation to DockerManager.

Note that most of the tests in kubelet_test.go needs to be migrated to
dockertools. For now, we use type assertion to convert the Runtime interface to
DockerManager in most tests.

@yujuhong
Copy link
Contributor Author

yujuhong commented May 2, 2015

/cc @vmarmol, @yifan-gu

@yujuhong
Copy link
Contributor Author

yujuhong commented May 2, 2015

The unit tests are still a mess. We need to adapt/rewrite most of them :(

@vmarmol
Copy link
Contributor

vmarmol commented May 2, 2015

Nice! This simplifies some of the spaghetti we made with the dependencies. Looks good overall.

Looks like Travis is complaining about boilerplate:

Boilerplate header is wrong for: ./pkg/kubelet/dockertools/fake_manager.go

@vmarmol vmarmol self-assigned this May 2, 2015
@yifan-gu
Copy link
Contributor

yifan-gu commented May 2, 2015

Awesome! Thanks for the work and cleanup @yujuhong !

@yujuhong
Copy link
Contributor Author

yujuhong commented May 4, 2015

@vmarmol, yep, the boilerplate was changed recently in #7597. I modified fake_manager.go to follow the new pattern. PTAL!

This change instructs kubelet to switch to using the Runtime interface. In order
to do it, the change moves the Prober instantiation to DockerManager.

Note that most of the tests in kubelet_test.go needs to be migrated to
dockertools. For now, we use type assertion to convert the Runtime interface to
DockerManager in most tests.
@vmarmol
Copy link
Contributor

vmarmol commented May 4, 2015

LGTM, thanks @yujuhong! Will merge on green.

vmarmol added a commit that referenced this pull request May 4, 2015
Kubelet: replace DockerManager with the Runtime interface
@vmarmol vmarmol merged commit 2ad933e into kubernetes:master May 4, 2015
@yujuhong yujuhong deleted the enable_runtime branch May 8, 2015 17:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants