Skip to content

chore(k8s): Remove cleanup index #1979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rmvangun merged 1 commit into from
Dec 8, 2025
+9 −9
Merged

chore(k8s): Remove cleanup index #1979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/provisioner/kubernetes/kubernetes_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
14 changes: 7 additions & 7 deletions pkg/provisioner/kubernetes/kubernetes_manager_public_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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])
}
})

Expand All @@ -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{
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down
Loading