1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2024-12-14 11:57:51 +00:00

Merge pull request #1393 from marquiz/devel/annotations-fix

nfd-master: correctly clean up annotations
This commit is contained in:
Kubernetes Prow Robot 2023-10-05 10:45:40 +02:00 committed by GitHub
commit 7c0913ed7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1065,7 +1065,9 @@ func (m *nfdMaster) updateNodeObject(cli *kubernetes.Clientset, nodeName string,
patches := createPatches(oldLabels, node.Labels, labels, "/metadata/labels")
patches = append(patches,
createPatches(
[]string{nfdv1alpha1.FeatureLabelsAnnotation, nfdv1alpha1.ExtendedResourceAnnotation},
[]string{
m.instanceAnnotation(nfdv1alpha1.FeatureLabelsAnnotation),
m.instanceAnnotation(nfdv1alpha1.ExtendedResourceAnnotation)},
node.Annotations,
annotations,
"/metadata/annotations")...)