chore: Exclude unwanted tags in e2e

k8s-infra-cherrypick-robot · Jul 30, 2024 · 95ecaa0 · 95ecaa0
1 parent 9ae9875
commit 95ecaa0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/tests/e2e/network/service_annotations.go b/tests/e2e/network/service_annotations.go
@@ -1499,6 +1499,9 @@ func waitComparePIPTags(tc *utils.AzureTestClient, expectedTags map[string]*stri
 		delete(tags, consts.LegacyClusterNameKey)
 		delete(tags, consts.ServiceTagKey)
 		delete(tags, consts.LegacyServiceTagKey)
+		for _, k := range utils.UnwantedTagKeys {
+			delete(tags, k)
+		}
 
 		printTags := func(name string, ts map[string]*string) {
 			msg := ""

diff --git a/tests/e2e/utils/network_utils.go b/tests/e2e/utils/network_utils.go
@@ -46,6 +46,8 @@ var (
 		false: "",
 		true:  "-IPv6",
 	}
+
+	UnwantedTagKeys = []string{"DateCreated"}
 )
 
 // getVirtualNetworkList returns the list of virtual networks in the cluster resource group.
@@ -285,9 +287,19 @@ func WaitCreatePIP(azureTestClient *AzureTestClient, ipName, rgName string, ipPa
 		}
 		return pip.IPAddress != nil, nil
 	})
+	if err == nil {
+		pip.Tags = cleanupTags(pip.Tags, UnwantedTagKeys)
+	}
 	return pip, err
 }
 
+func cleanupTags(tags map[string]*string, unwantedKeys []string) map[string]*string {
+	for _, key := range unwantedKeys {
+		delete(tags, key)
+	}
+	return tags
+}
+
 func WaitCreatePIPPrefix(
 	cli *AzureTestClient,
 	name, rgName string,
@@ -424,6 +436,9 @@ func WaitGetPIP(azureTestClient *AzureTestClient, ipName string) (pip aznetwork.
 		}
 		return true, nil
 	})
+	if err == nil {
+		pip.Tags = cleanupTags(pip.Tags, UnwantedTagKeys)
+	}
 	return
 }