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

delete err when return _ #45709

Merged
merged 1 commit into from
May 17, 2017
Merged

delete err when return _ #45709

merged 1 commit into from
May 17, 2017

Conversation

YuPengZTE
Copy link
Contributor

Signed-off-by: yupengzte yu.peng36@zte.com.cn

What this PR does / why we need it:

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #

Special notes for your reviewer:

Release note:

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 12, 2017
@k8s-ci-robot
Copy link
Contributor

Hi @YuPengZTE. 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-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 12, 2017
@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels May 12, 2017
@cblecker
Copy link
Member

What is the need for this? It looks like two lines down, it calls for err, so I'm not sure why we wouldn't want to return it.

janetkuo
janetkuo reviewed May 12, 2017
View reviewed changes
Copy link
Member

@janetkuo janetkuo left a comment

Choose a reason for hiding this comment

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

getAllDaemonSetPods will always return nil error. We don't need to return error in getAllDaemonSetPods at all.

@janetkuo
Copy link
Member

@k8s-bot ok to test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 12, 2017
@janetkuo
Copy link
Member

/release-note-none

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels May 12, 2017
@YuPengZTE
Copy link
Contributor Author

@k8s-bot ok to test

lukaszo
lukaszo reviewed May 16, 2017
View reviewed changes
pkg/controller/daemon/update.go
@@ -38,7 +38,7 @@ func (dsc *DaemonSetsController) rollingUpdate(ds *extensions.DaemonSet) error {
return fmt.Errorf("couldn't get node to daemon pod mapping for daemon set %q: %v", ds.Name, err)
}

_, oldPods, err := dsc.getAllDaemonSetPods(ds, nodeToDaemonPods)
Copy link
Contributor

Choose a reason for hiding this comment

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

If getAllDaemonSetPods is always returning nil just change the function itself to not return an error.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, good idea.
Changes have done, PTAL.
Thanks @lukaszo

@YuPengZTE
delete err when return _
e463c28 
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
@lukaszo
Copy link
Contributor

lukaszo commented May 16, 2017

/approve

@YuPengZTE
Copy link
Contributor Author

/assign @janetkuo

@janetkuo
Copy link
Member

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 17, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: YuPengZTE, janetkuo, lukaszo

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 May 17, 2017
@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 45709, 41939)

@k8s-github-robot k8s-github-robot merged commit 8863bd4 into kubernetes:master May 17, 2017
@YuPengZTE YuPengZTE deleted the devGetAllDaemonSetPods branch May 17, 2017 06:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lukaszo lukaszo lukaszo left review comments

@janetkuo janetkuo janetkuo approved these changes

Assignees

@lukaszo lukaszo

@janetkuo janetkuo

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@YuPengZTE @k8s-ci-robot @cblecker @janetkuo @lukaszo @k8s-github-robot