Merge pull request #49438 from zhangxiaoyu-zidif/delete-err-def-for-drain

Automatic merge from submit-queue (batch tested with PRs 48911, 49475, 49438, 49362, 49274) Delete redundant err definition **What this PR does / why we need it**: Delete redundant err definition line 642 has its definition and initialization, so line 641 is redundant. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # NONE **Special notes for your reviewer**: NONE **Release note**: ```release-note NONE ```

Merge pull request #49438 from zhangxiaoyu-zidif/delete-err-def-for-drain
0e94e943 · Kubernetes Submit Queue · GitHub · 159dcbfb · 1b785d09 · 0e94e943
Commit 0e94e943 authored Jul 24, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

drain.go pkg/kubectl/cmd/drain.go +0 -1

No files found.
--- a/pkg/kubectl/cmd/drain.go
+++ b/pkg/kubectl/cmd/drain.go
@@ -641,7 +641,6 @@ func (o *DrainOptions) RunCordonOrUncordon(desired bool) error {
 		} else {
 			helper := resource.NewHelper(o.restClient, o.nodeInfo.Mapping)
 			node.Spec.Unschedulable = desired
-			var err error
 			newData, err := json.Marshal(obj)
 			patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, obj)
 			if err != nil {