Merge pull request #17507 from hakman/azure-test

k8s-ci-robot · web-flow · commit 6ba41fbcf7f1 · 2025-07-21T07:58:28.000-07:00
azure: Use creation timestamp tag in e2e tests
diff --git a/protokube/pkg/gossip/azure/client.go b/protokube/pkg/gossip/azure/client.go
@@ -42,7 +42,7 @@ func (m *instanceComputeMetadata) GetTags() (map[string]string, error) {
 	tags := map[string]string{}
 	l := strings.Split(m.Tags, ";")
 	for _, t := range l {
-		tl := strings.Split(t, ":")
+		tl := strings.SplitN(t, ":", 2)
 		if len(tl) != 2 {
 			return nil, fmt.Errorf("unexpected tag format: %s", tl)
 		}
diff --git a/tests/e2e/kubetest2-kops/deployer/up.go b/tests/e2e/kubetest2-kops/deployer/up.go
@@ -192,7 +192,9 @@ func (d *deployer) createCluster(zones []string, adminAccess string, yes bool) e
 			args = appendIfUnset(args, "--master-size", "c5.large")
 		}
 	case "azure":
-		args = appendIfUnset(args, "--cloud-labels", "DO-NOT-DELETE=kOps")
+		// Ensure https://github.com/Azure/rg-cleanup deletes removes resources
+		args = appendIfUnset(args, "--cloud-labels", "creationTimestamp="+time.Now().Format(time.RFC3339))
+		// Use SKUs for which there is enough quota
 		args = appendIfUnset(args, "--control-plane-size", "Standard_D4s_v3")
 		args = appendIfUnset(args, "--node-size", "Standard_D2s_v3")
 	case "gce":

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func (m *instanceComputeMetadata) GetTags() (map[string]string, error) {`
`42`	`42`	`tags := map[string]string{}`
`43`	`43`	`l := strings.Split(m.Tags, ";")`
`44`	`44`	`for _, t := range l {`
`45`		`- tl := strings.Split(t, ":")`
	`45`	`+ tl := strings.SplitN(t, ":", 2)`
`46`	`46`	`if len(tl) != 2 {`
`47`	`47`	`return nil, fmt.Errorf("unexpected tag format: %s", tl)`
`48`	`48`	`}`