From 960e650c7972419feb7ffd3e421fad213e0f5ee0 Mon Sep 17 00:00:00 2001
From: Ryan VanGundy <85766511+rmvangun@users.noreply.github.com>
Date: Mon, 8 Dec 2025 08:20:24 -0500
Subject: [PATCH] chore(k8s): Remove cleanup index

The cleanup kustomizations received an index value. This isn't necessary as they already have unique prefixes.

Signed-off-by: Ryan VanGundy <85766511+rmvangun@users.noreply.github.com>
---
 pkg/provisioner/kubernetes/kubernetes_manager.go   |  4 ++--
 .../kubernetes/kubernetes_manager_public_test.go   | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkg/provisioner/kubernetes/kubernetes_manager.go b/pkg/provisioner/kubernetes/kubernetes_manager.go
index af3c7a63e..e7ad7599c 100644
--- a/pkg/provisioner/kubernetes/kubernetes_manager.go
+++ b/pkg/provisioner/kubernetes/kubernetes_manager.go
@@ -772,11 +772,11 @@ func (k *BaseKubernetesManager) DeleteBlueprint(blueprint *blueprintv1alpha1.Blu
 				}
 			}
 
-			for i, cleanupPath := range kustomization.Cleanup {
+			for _, cleanupPath := range kustomization.Cleanup {
 				cleanupPathNormalized := strings.ReplaceAll(cleanupPath, "\\", "/")
 				fullCleanupPath := basePath + "/cleanup/" + cleanupPathNormalized
 
-				cleanupKustomizationName := fmt.Sprintf("%s-cleanup-%d", kustomization.Name, i)
+				cleanupKustomizationName := fmt.Sprintf("%s-cleanup", kustomization.Name)
 
 				timeout := metav1.Duration{Duration: 30 * time.Minute}
 				if kustomization.Timeout != nil && kustomization.Timeout.Duration != 0 {
diff --git a/pkg/provisioner/kubernetes/kubernetes_manager_public_test.go b/pkg/provisioner/kubernetes/kubernetes_manager_public_test.go
index 93fa1cbc6..0f42b5a65 100644
--- a/pkg/provisioner/kubernetes/kubernetes_manager_public_test.go
+++ b/pkg/provisioner/kubernetes/kubernetes_manager_public_test.go
@@ -2867,7 +2867,7 @@ func TestBaseKubernetesManager_DeleteBlueprint(t *testing.T) {
 			if deletedResources[name] {
 				return nil, fmt.Errorf("the server could not find the requested resource")
 			}
-			if name == "test-kustomization-cleanup-0" {
+			if name == "test-kustomization-cleanup" {
 				return &unstructured.Unstructured{
 					Object: map[string]any{
 						"status": map[string]any{
@@ -2915,8 +2915,8 @@ func TestBaseKubernetesManager_DeleteBlueprint(t *testing.T) {
 		if len(applyCalls) != 1 {
 			t.Errorf("Expected 1 apply call for cleanup kustomization, got %d", len(applyCalls))
 		}
-		if applyCalls[0] != "test-kustomization-cleanup-0" {
-			t.Errorf("Expected apply call for 'test-kustomization-cleanup-0', got %s", applyCalls[0])
+		if applyCalls[0] != "test-kustomization-cleanup" {
+			t.Errorf("Expected apply call for 'test-kustomization-cleanup', got %s", applyCalls[0])
 		}
 	})
 
@@ -2936,7 +2936,7 @@ func TestBaseKubernetesManager_DeleteBlueprint(t *testing.T) {
 			if deletedResources[name] {
 				return nil, fmt.Errorf("the server could not find the requested resource")
 			}
-			if name == "test-kustomization-cleanup-0" || name == "test-kustomization-cleanup-1" {
+			if name == "test-kustomization-cleanup" {
 				return &unstructured.Unstructured{
 					Object: map[string]any{
 						"status": map[string]any{
@@ -2999,7 +2999,7 @@ func TestBaseKubernetesManager_DeleteBlueprint(t *testing.T) {
 			if deletedResources[name] {
 				return nil, fmt.Errorf("the server could not find the requested resource")
 			}
-			if name == "test-kustomization-cleanup-0" {
+			if name == "test-kustomization-cleanup" {
 				return &unstructured.Unstructured{
 					Object: map[string]any{
 						"status": map[string]any{
@@ -3069,7 +3069,7 @@ func TestBaseKubernetesManager_DeleteBlueprint(t *testing.T) {
 			if deletedResources[name] {
 				return nil, fmt.Errorf("the server could not find the requested resource")
 			}
-			if name == "test-kustomization-cleanup-0" {
+			if name == "test-kustomization-cleanup" {
 				return &unstructured.Unstructured{
 					Object: map[string]any{
 						"status": map[string]any{
@@ -3205,7 +3205,7 @@ func TestBaseKubernetesManager_DeleteBlueprint(t *testing.T) {
 			if deletedResources[name] {
 				return nil, fmt.Errorf("the server could not find the requested resource")
 			}
-			if name == "test-kustomization-cleanup-0" {
+			if name == "test-kustomization-cleanup" {
 				return &unstructured.Unstructured{
 					Object: map[string]any{
 						"status": map[string]any{