Merge pull request #17682 from ameukam/add-tags-support

Support tags for kubetest-kops

Author: k8s-ci-robot

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

@@ -78,6 +78,8 @@ 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:"-"`
@@ -140,6 +142,10 @@ 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",
+		},
 	}
 	dir, err := defaultArtifactsDir()
 	if err != nil {

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

@@ -194,6 +194,7 @@ func (d *deployer) createCluster(zones []string, adminAccess string, yes bool) e
 		}
 		args = append(args, createArgs...)
 	}
+	args = append(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