github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Fix leftover Taint-related helper function

Browse Source
This commit is contained in:
gmarek 2017-02-23 14:58:52 +01:00
parent 6637592b1d
commit f9d6086217
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/controller_utils.go
View File

@ -922,7 +922,7 @@ func PatchNodeTaints(c clientset.Interface, nodeName string, oldNode *v1.Node, n
return fmt.Errorf("failed to marshal old node %#v for node %q: %v", oldNode, nodeName, err) return fmt.Errorf("failed to marshal old node %#v for node %q: %v", oldNode, nodeName, err)
} }
newAnnotations := newNode.Annotations newTaints := newNode.Spec.Taints
objCopy, err := api.Scheme.DeepCopy(oldNode) objCopy, err := api.Scheme.DeepCopy(oldNode)
if err != nil { if err != nil {
return fmt.Errorf("failed to copy node object %#v: %v", oldNode, err) return fmt.Errorf("failed to copy node object %#v: %v", oldNode, err)
@ -931,7 +931,7 @@ func PatchNodeTaints(c clientset.Interface, nodeName string, oldNode *v1.Node, n
if !ok { if !ok {
return fmt.Errorf("failed to cast copy onto node object %#v: %v", newNode, err) return fmt.Errorf("failed to cast copy onto node object %#v: %v", newNode, err)
} }
newNode.Annotations = newAnnotations newNode.Spec.Taints = newTaints
newData, err := json.Marshal(newNode) newData, err := json.Marshal(newNode)
if err != nil { if err != nil {
return fmt.Errorf("failed to marshal new node %#v for node %q: %v", newNode, nodeName, err) return fmt.Errorf("failed to marshal new node %#v for node %q: %v", newNode, nodeName, err)