Merge pull request #17826 from hakman/fix-cloud-labels

kubetest2: Fix cloud-labels for non-Azure providers

Author: k8s-ci-robot

tests/e2e/kubetest2-kops/deployer/deployer.go

@@ -79,8 +79,6 @@ type deployer struct {
 	SSHPublicKeyPath  string `flag:"ssh-public-key" desc:"The path to the public key passed to the cloud provider"`
 	SSHUser           string `flag:"ssh-user" desc:"The SSH user to use for SSH access to instances"`
 
-	Tags []string `flag:"tags" desc:"Tags to apply to the cluster resources in key=value format"`
-
 	TerraformVersion string `flag:"terraform-version" desc:"The version of terraform to use for applying the cluster"`
 
 	ArtifactsDir string `flag:"-"`
@@ -143,12 +141,6 @@ func New(opts types.Options) (types.Deployer, *pflag.FlagSet) {
 		BoskosResourceType:      "gce-project",
 		BoskosAcquireTimeout:    5 * time.Minute,
 		BoskosHeartbeatInterval: 5 * time.Minute,
-		Tags: []string{
-			"group=sig-cluster-lifecycle",
-			"subproject=kops",
-			// Ensure https://github.com/Azure/rg-cleanup deletes removes resources
-			"creationTimestamp=" + time.Now().Format(time.RFC3339),
-		},
 	}
 	dir, err := defaultArtifactsDir()
 	if err != nil {

tests/e2e/kubetest2-kops/deployer/up.go

@@ -175,6 +175,16 @@ func (d *deployer) createCluster(zones []string, adminAccess string, yes bool) e
 		args = append(args, "--yes")
 	}
 
+	tags := []string{
+		"group=sig-cluster-lifecycle",
+		"subproject=kops",
+	}
+	if d.CloudProvider == "azure" {
+		// Ensure https://github.com/Azure/rg-cleanup deletes removes resources
+		tags = append(tags, "creationTimestamp="+time.Now().Format(time.RFC3339))
+	}
+	args = appendIfUnset(args, "--cloud-labels", strings.Join(tags, ","))
+
 	isArm := false
 	if d.CreateArgs != "" {
 		if strings.Contains(d.CreateArgs, "arm64") {
@@ -186,7 +196,6 @@ func (d *deployer) createCluster(zones []string, adminAccess string, yes bool) e
 		}
 		args = append(args, createArgs...)
 	}
-	args = appendIfUnset(args, "--cloud-labels", strings.Join(d.Tags, ","))
 	args = appendIfUnset(args, "--admin-access", adminAccess)
 
 	// Dont set --master-count if either --control-plane-count or --master-count