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

Merge pull request #1443 from marquiz/devel/e2e-annotations-cleanup

Browse source 
test/e2e: cleanup feature annotations
This commit is contained in:
Kubernetes Prow Robot 2023-10-27 16:46:20 +02:00 committed by GitHub
commit 72fc478ab5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
test/e2e/node_feature_discovery_test.go
View file

@ -66,6 +66,12 @@ func cleanupNode(ctx context.Context, cs clientset.Interface) {
nfdLabels[name] = struct{}{} nfdLabels[name] = struct{}{}
} }
} }
nfdAnnotations := map[string]struct{}{}
for _, name := range strings.Split(node.Annotations[nfdv1alpha1.FeatureAnnotationsTrackingAnnotation], ",") {
if strings.Contains(name, "/") {
nfdAnnotations[name] = struct{}{}
}
}
nfdERs := map[string]struct{}{} nfdERs := map[string]struct{}{}
for _, name := range strings.Split(node.Annotations[nfdv1alpha1.ExtendedResourceAnnotation], ",") { for _, name := range strings.Split(node.Annotations[nfdv1alpha1.ExtendedResourceAnnotation], ",") {
if strings.Contains(name, "/") { if strings.Contains(name, "/") {
@ -84,7 +90,8 @@ func cleanupNode(ctx context.Context, cs clientset.Interface) {
// Remove annotations // Remove annotations
for key := range node.Annotations { for key := range node.Annotations {
if strings.HasPrefix(key, nfdv1alpha1.AnnotationNs) { _, ok := nfdAnnotations[key]
if ok || strings.HasPrefix(key, nfdv1alpha1.AnnotationNs) || strings.HasPrefix(key, nfdv1alpha1.FeatureAnnotationNs) {
delete(node.Annotations, key) delete(node.Annotations, key)
update = true update = true
} }