Skip to content

K
k3s
Commit 38f497a6 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #50293 from xingzhou/add-err-return

Automatic merge from submit-queue (batch tested with PRs 45993, 50293) Add error return for the Marshal object invocation. Add error return for the Marshal object invocation. **Release note**: ``` None ```
parents f0ff280f 65c28eb6
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
pkg/kubectl/cmd/drain.go
View file @ 38f497a6
...@@ -631,6 +631,9 @@ func (o *DrainOptions) RunCordonOrUncordon(desired bool) error { ...@@ -631,6 +631,9 @@ func (o *DrainOptions) RunCordonOrUncordon(desired bool) error {
return err return err
} }
oldData, err := json.Marshal(obj) oldData, err := json.Marshal(obj)
if err != nil {
return err
}
node, ok := obj.(*corev1.Node) node, ok := obj.(*corev1.Node)
if !ok { if !ok {
return fmt.Errorf("unexpected Type%T, expected Node", obj) return fmt.Errorf("unexpected Type%T, expected Node", obj)
...@@ -642,6 +645,9 @@ func (o *DrainOptions) RunCordonOrUncordon(desired bool) error { ...@@ -642,6 +645,9 @@ func (o *DrainOptions) RunCordonOrUncordon(desired bool) error {
helper := resource.NewHelper(o.restClient, o.nodeInfo.Mapping) helper := resource.NewHelper(o.restClient, o.nodeInfo.Mapping)
node.Spec.Unschedulable = desired node.Spec.Unschedulable = desired
newData, err := json.Marshal(obj) newData, err := json.Marshal(obj)
if err != nil {
return err
}
patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, obj) patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, obj)
if err != nil { if err != nil {
return err return err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment