Merge pull request #37350 from chentao1596/delete-meaningless-judgments

Automatic merge from submit-queue (batch tested with PRs 39280, 37350, 39389, 39390, 39313) delete meaningless judgments What this PR does / why we need it： Whether "err" is nil or not, "err" can be return, so the judgment "err !=nil " is unnecessary

Merge pull request #37350 from chentao1596/delete-meaningless-judgments
fe391d7b · Kubernetes Submit Queue · GitHub · 27850a79 · 6d4341b3 · fe391d7b
Commit fe391d7b authored Jan 03, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

pod_workers.go pkg/kubelet/pod_workers.go +1 -4

No files found.
--- a/pkg/kubelet/pod_workers.go
+++ b/pkg/kubelet/pod_workers.go
@@ -171,10 +171,7 @@ func (p *podWorkers) managePodLoop(podUpdates <-chan UpdatePodOptions) {
 				updateType:     update.UpdateType,
 			})
 			lastSyncTime = time.Now()
-			if err != nil {
+			return err
-				return err
-			}
-			return nil
 		}()
 		// notify the call-back function if the operation succeeded or not
 		if update.OnCompleteFunc != nil {