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

Add error return for the Marshal object invocation.

Browse Source 
Add error return for the Marshal object invocation.
This commit is contained in:
Xing Zhou
2017-08-08 13:38:31 +08:00
parent 3900e36d62
commit 65c28eb64f
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -631,6 +631,9 @@ func (o *DrainOptions) RunCordonOrUncordon(desired bool) error {
return err
}
oldData, err := json.Marshal(obj)
if err != nil {
return err
}
node, ok := obj.(*corev1.Node)
if !ok {
return fmt.Errorf("unexpected Type%T, expected Node", obj)
@@ -642,6 +645,9 @@ func (o *DrainOptions) RunCordonOrUncordon(desired bool) error {
helper := resource.NewHelper(o.restClient, o.nodeInfo.Mapping)
node.Spec.Unschedulable = desired
newData, err := json.Marshal(obj)
if err != nil {
return err
}
patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, obj)
if err != nil {
return err