chore: bump ktf and use its new features (#3406)

- Bumps KTF to v0.26.0
- Uses labels to determine if the cluster was created for test purposes

Author: czeslavo

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/kong/deck v1.17.1
 	github.com/kong/go-kong v0.34.1-0.20221222170410-6c81ce561662
-	github.com/kong/kubernetes-testing-framework v0.25.0
+	github.com/kong/kubernetes-testing-framework v0.26.0
 	github.com/lithammer/dedent v1.1.0
 	github.com/miekg/dns v1.1.50
 	github.com/mitchellh/mapstructure v1.5.0

go.sum

@@ -567,8 +567,8 @@ github.com/kong/deck v1.17.1 h1:mBtd5CBv+Ouwz6SbOWfpvQvSMsiD3jwIeiKVU0oNvFI=
 github.com/kong/deck v1.17.1/go.mod h1:IH/Ic9dgBwvb1WHOx3+0BUzo+SYiVjd9inEe+JIIeK4=
 github.com/kong/go-kong v0.34.1-0.20221222170410-6c81ce561662 h1:IIIAzs6eNp+lA+E0k9oooAyqmAJyAA/9Ebyb0y19mrU=
 github.com/kong/go-kong v0.34.1-0.20221222170410-6c81ce561662/go.mod h1:G30uJtuJOjJXFL1vulIrz/27KhPdE2g0GtJZlNINU6U=
-github.com/kong/kubernetes-testing-framework v0.25.0 h1:teuhY67W9/TDaBNjfQFBHUuptda6o8ilpjSW7/sXeKc=
-github.com/kong/kubernetes-testing-framework v0.25.0/go.mod h1:5LiOMyPajmukMTx41vxiUrzx8kvFoVcZfpqpcHtEIkE=
+github.com/kong/kubernetes-testing-framework v0.26.0 h1:rusiPJVMUdgpKm08/1hGcCRkQYY2Ct2iQ66TukLwUIM=
+github.com/kong/kubernetes-testing-framework v0.26.0/go.mod h1:clm6sSUBFEXGBA427BN8AEBdF0VCNeVmG3O4uPjF84g=
 github.com/kong/semver/v4 v4.0.1 h1:DIcNR8W3gfx0KabFBADPalxxsp+q/5COwIFkkhrFQ2Y=
 github.com/kong/semver/v4 v4.0.1/go.mod h1:LImQ0oT15pJvSns/hs2laLca2zcYoHu5EsSNY0J6/QA=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=

hack/cleanup_gke_clusters.go

@@ -114,7 +114,7 @@ func findOrphanedClusters(ctx context.Context, mgrc *container.ClusterManagerCli
 
 	var orphanedClusterNames []string
 	for _, cluster := range clusterListResp.Clusters {
-		if isCreatedByTests(cluster) {
+		if e2e.IsGKETestCluster(cluster) {
 			createdAt, err := time.Parse(time.RFC3339, cluster.CreateTime)
 			if err != nil {
 				return nil, err
@@ -131,11 +131,3 @@ func findOrphanedClusters(ctx context.Context, mgrc *container.ClusterManagerCli
 
 	return orphanedClusterNames, nil
 }
-
-func isCreatedByTests(cluster *containerpb.Cluster) bool {
-	if cluster == nil {
-		return false
-	}
-
-	return e2e.IsCreatedByE2ETests(cluster.Name)
-}

test/e2e/clusters.go

@@ -1,14 +1,29 @@
 package e2e
 
-import "strings"
+import (
+	"cloud.google.com/go/container/apiv1/containerpb"
+)
 
 const (
-	// GKETestClusterNamePrefix defines a prefix that is used for naming GKE clusters created in tests.
-	// It allows hack/cleanup_gke_clusters.go script to deterministically tell whether a cluster should
-	// be taken into account in the cleanup procedure.
-	gkeTestClusterNamePrefix = "e2e-"
+	gkeTestClusterLabel = "test-cluster"
+	gkeLabelValueTrue   = "true"
 )
 
-func IsCreatedByE2ETests(clusterName string) bool {
-	return strings.HasPrefix(clusterName, gkeTestClusterNamePrefix)
+// IsGKETestCluster tells if the GKE cluster has been created for test purposes.
+func IsGKETestCluster(cluster *containerpb.Cluster) bool {
+	if cluster == nil {
+		return false
+	}
+
+	if labels := cluster.GetResourceLabels(); labels != nil {
+		return labels[gkeTestClusterLabel] == gkeLabelValueTrue
+	}
+
+	return false
+}
+
+func gkeTestClusterLabels() map[string]string {
+	return map[string]string{
+		gkeTestClusterLabel: gkeLabelValueTrue,
+	}
 }

test/e2e/helpers_test.go

@@ -137,7 +137,7 @@ func createExistingGKEBuilder(ctx context.Context, name string) (*environments.B
 
 func createGKEBuilder() (*environments.Builder, error) {
 	var (
-		name        = gkeTestClusterNamePrefix + uuid.NewString()
+		name        = "e2e-" + uuid.NewString()
 		gkeCreds    = os.Getenv(gke.GKECredsVar)
 		gkeProject  = os.Getenv(gke.GKEProjectVar)
 		gkeLocation = os.Getenv(gke.GKELocationVar)
@@ -149,7 +149,8 @@ func createGKEBuilder() (*environments.Builder, error) {
 		NewBuilder([]byte(gkeCreds), gkeProject, gkeLocation).
 		WithName(name).
 		WithWaitForTeardown(true).
-		WithCreateSubnet(true)
+		WithCreateSubnet(true).
+		WithLabels(gkeTestClusterLabels())
 
 	if clusterVersionStr != "" {
 		k8sVersion, err := semver.Parse(strings.TrimPrefix(clusterVersionStr, "v"))