github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Delete redundant err definition

Browse Source
This commit is contained in:
zhangxiaoyu-zidif
2017-07-22 16:19:32 +08:00
parent 5529d01a22
commit 1b785d09d4
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubectl/cmd/drain.go
View File

@@ -638,7 +638,6 @@ func (o *DrainOptions) RunCordonOrUncordon(desired bool) error {
} else { } else {
helper := resource.NewHelper(o.restClient, o.nodeInfo.Mapping) helper := resource.NewHelper(o.restClient, o.nodeInfo.Mapping)
node.Spec.Unschedulable = desired node.Spec.Unschedulable = desired
var err error
newData, err := json.Marshal(obj) newData, err := json.Marshal(obj)
patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, obj) patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, obj)
if err != nil { if err != nil {