Merge pull request #1571 from marquiz/devel/nfd-master-status-patching

k8s-ci-robot · web-flow · commit fe69118fd6b1 · 2024-01-26T23:21:29.000+01:00
nfd-master: fix node status patching
diff --git a/pkg/nfd-master/nfd-master.go b/pkg/nfd-master/nfd-master.go
@@ -1419,7 +1419,7 @@ func (m *nfdMaster) patchNode(nodeName string, patches []utils.JsonPatch, subres
 	}
 	data, err := json.Marshal(patches)
 	if err == nil {
-		_, err = m.k8sClient.CoreV1().Nodes().Patch(context.TODO(), nodeName, types.JSONPatchType, data, metav1.PatchOptions{})
+		_, err = m.k8sClient.CoreV1().Nodes().Patch(context.TODO(), nodeName, types.JSONPatchType, data, metav1.PatchOptions{}, subresources...)
 	}
 	return err
 }

Original file line number	Diff line number	Diff line change
`@@ -1419,7 +1419,7 @@ func (m *nfdMaster) patchNode(nodeName string, patches []utils.JsonPatch, subres`
`1419`	`1419`	`}`
`1420`	`1420`	`data, err := json.Marshal(patches)`
`1421`	`1421`	`if err == nil {`
`1422`		`- _, err = m.k8sClient.CoreV1().Nodes().Patch(context.TODO(), nodeName, types.JSONPatchType, data, metav1.PatchOptions{})`
	`1422`	`+ _, err = m.k8sClient.CoreV1().Nodes().Patch(context.TODO(), nodeName, types.JSONPatchType, data, metav1.PatchOptions{}, subresources...)`
`1423`	`1423`	`}`
`1424`	`1424`	`return err`
`1425`	`1425`	`}`