ci: Exclude soak-periodic-2213793 Cluster from cleanup for Windows …

…investigation (#5910)
aws · Mar 20, 2024 · 466484f · 466484f
1 parent 46ec68e
commit 466484f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/test/hack/resource/clean/main.go b/test/hack/resource/clean/main.go
@@ -34,7 +34,9 @@ import (
 
 const sweeperCleanedResourcesTableName = "sweeperCleanedResources"
 
-var excludedClusters = []string{}
+var excludedClusters = []string{
+	"soak-periodic-2213793",
+}
 
 func main() {
 	expiration := flag.String("expiration", "12h", "define the expirationTTL of the resources")
@@ -82,7 +84,7 @@ func main() {
 		// If there's no cluster defined, clean up all expired resources. otherwise, only cleanup the resources associated with the cluster
 		if lo.FromPtr(clusterName) == "" {
 			ids, err = resourceTypes[i].GetExpired(ctx, expirationTime, excludedClusters)
-		} else if !slices.Contains(excludedClusters, *clusterName) {
+		} else if !slices.Contains(excludedClusters, lo.FromPtr(clusterName)) {
 			ids, err = resourceTypes[i].Get(ctx, lo.FromPtr(clusterName))
 		}
 		if err != nil {

diff --git a/test/hack/resource/pkg/resourcetypes/instance.go b/test/hack/resource/pkg/resourcetypes/instance.go
@@ -63,7 +63,7 @@ func (i *Instance) GetExpired(ctx context.Context, expirationTime time.Time, exc
 		for _, res := range out.Reservations {
 			for _, instance := range res.Instances {
 				clusterName, found := lo.Find(instance.Tags, func(tag ec2types.Tag) bool {
-					return *tag.Key == k8sClusterTag
+					return *tag.Key == karpenterTestingTag
 				})
 				if found && slices.Contains(excludedClusters, lo.FromPtr(clusterName.Value)) {
 					continue

diff --git a/test/hack/resource/pkg/resourcetypes/securitygroup.go b/test/hack/resource/pkg/resourcetypes/securitygroup.go
@@ -60,7 +60,7 @@ func (sg *SecurityGroup) GetExpired(ctx context.Context, expirationTime time.Tim
 
 		for _, sgroup := range out.SecurityGroups {
 			clusterName, found := lo.Find(sgroup.Tags, func(tag ec2types.Tag) bool {
-				return *tag.Key == k8sClusterTag
+				return *tag.Key == karpenterTestingTag
 			})
 			if found && slices.Contains(excludedClusters, lo.FromPtr(clusterName.Value)) {
 				continue

diff --git a/test/hack/resource/pkg/resourcetypes/stack.go b/test/hack/resource/pkg/resourcetypes/stack.go
@@ -57,7 +57,7 @@ func (s *Stack) GetExpired(ctx context.Context, expirationTime time.Time, exclud
 		})
 		for _, stack := range stacks {
 			clusterName, found := lo.Find(stack.Tags, func(tag cloudformationtypes.Tag) bool {
-				return *tag.Key == k8sClusterTag
+				return *tag.Key == karpenterTestingTag
 			})
 			if found && slices.Contains(excludedClusters, lo.FromPtr(clusterName.Value)) {
 				continue