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

pkg/kubelet/dockertools/docker_manager.go: removing unused stuff #40527

Merged
merged 2 commits into from
Jan 31, 2017

Conversation

php-coder
Copy link
Contributor

@php-coder php-coder commented Jan 26, 2017

This PR removes unused constants and variables. I checked that neither kubernetes nor openshift code aren't using them.

@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-none Denotes a PR that doesn't merit a release note. labels Jan 26, 2017
@k8s-ci-robot
Copy link
Contributor

Hi @php-coder. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with @k8s-bot ok to test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-reviewable
Copy link

This change is Reviewable

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 26, 2017
@@ -196,18 +196,6 @@ type podGetter interface {
GetPodByUID(kubetypes.UID) (*v1.Pod, bool)
}

func PodInfraContainerEnv(env map[string]string) kubecontainer.Option {
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the info. I've removed this commit.

ErrNoContainersInPod = errors.New("NoContainersInPod")

// ErrNoPodInfraContainerInPod is returned when there is no pod infra container for a given pod
ErrNoPodInfraContainerInPod = errors.New("NoPodInfraContainerInPod")
Copy link
Contributor

Choose a reason for hiding this comment

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

@yujuhong ok to remove these error reasons, or were you planning on using them?
Seemed usage of ErrNoContainersInPod stopped in bb417e8 -- pkg/kubelet/dockertools/manager.go and ErrNoPodInfraContainerInPod doesn't look like it was ever in use as far as I can tell (note I haven't searched back before the origin of pkg/kubelet/dockertools/manager.go).

Copy link
Contributor

Choose a reason for hiding this comment

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

Don't think we are going to use them, especially now that we are transitioning to CRI. Most of the code in this package (especially those mentioning "infra container") will be deprecated eventually.

@mtaufen
Copy link
Contributor

mtaufen commented Jan 30, 2017

@php-coder If there is no release note, you can just omit that entire section from the initial comment.

@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 31, 2017
@mtaufen
Copy link
Contributor

mtaufen commented Jan 31, 2017

/lgtm

Thanks for this work :)

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 31, 2017
@Random-Liu
Copy link
Member

/approve

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

The following people have approved this PR: Random-Liu, php-coder

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 31, 2017
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 40527, 40738, 39366, 40609, 40748)

@k8s-github-robot k8s-github-robot merged commit 31df7e4 into kubernetes:master Jan 31, 2017
@k8s-github-robot
Copy link

Automatic merge from submit-queue

@php-coder php-coder deleted the docker_manager_cleanup branch February 1, 2017 00:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants