Merge pull request #622 from sdowell/fix-partial-destroy

fix: retain inventory for pruning fail/skip
kubernetes-sigs · Jul 24, 2023 · 833d70f · 833d70f
2 parents 8609e42 + 1c4eae9
commit 833d70f
Show file tree

Hide file tree

Showing 18 changed files with 400 additions and 208 deletions.
diff --git a/pkg/apply/destroyer_test.go b/pkg/apply/destroyer_test.go
@@ -292,7 +292,7 @@ func TestDestroyerCancel(t *testing.T) {
 					EventType: event.ActionGroupType,
 					ActionGroupEvent: &testutil.ExpActionGroupEvent{
 						Action:    event.InventoryAction,
-						GroupName: "delete-inventory-0",
+						GroupName: "inventory-delete-or-update-0",
 						Type:      event.Started,
 					},
 				},
@@ -301,7 +301,7 @@ func TestDestroyerCancel(t *testing.T) {
 					EventType: event.ActionGroupType,
 					ActionGroupEvent: &testutil.ExpActionGroupEvent{
 						Action:    event.InventoryAction,
-						GroupName: "delete-inventory-0",
+						GroupName: "inventory-delete-or-update-0",
 						Type:      event.Finished,
 					},
 				},

diff --git a/pkg/apply/solver/solver.go b/pkg/apply/solver/solver.go
@@ -211,26 +211,22 @@ func (t *TaskQueueBuilder) Build(taskContext *taskrunner.TaskContext, o Options)
 		}
 	}
 
-	// TODO: add InvSetTask when Destroy=true to retain undeleted objects
-	if !o.Destroy {
-		klog.V(2).Infoln("adding inventory set task")
-		prevInvIds, _ := t.InvClient.GetClusterObjs(t.invInfo)
-		tasks = append(tasks, &task.InvSetTask{
-			TaskName:      "inventory-set-0",
-			InvClient:     t.InvClient,
-			InvInfo:       t.invInfo,
-			PrevInventory: prevInvIds,
-			DryRun:        o.DryRunStrategy,
-		})
+	prevInvIds, _ := t.InvClient.GetClusterObjs(t.invInfo)
+	klog.V(2).Infoln("adding delete/update inventory task")
+	var taskName string
+	if o.Destroy {
+		taskName = "inventory-delete-or-update-0"
 	} else {
-		klog.V(2).Infoln("adding delete inventory task")
-		tasks = append(tasks, &task.DeleteInvTask{
-			TaskName:  "delete-inventory-0",
-			InvClient: t.InvClient,
-			InvInfo:   t.invInfo,
-			DryRun:    o.DryRunStrategy,
-		})
+		taskName = "inventory-set-0"
 	}
+	tasks = append(tasks, &task.DeleteOrUpdateInvTask{
+		TaskName:      taskName,
+		InvClient:     t.InvClient,
+		InvInfo:       t.invInfo,
+		PrevInventory: prevInvIds,
+		DryRun:        o.DryRunStrategy,
+		Destroy:       o.Destroy,
+	})
 
 	return &TaskQueue{tasks: tasks}
 }

diff --git a/pkg/apply/solver/solver_test.go b/pkg/apply/solver/solver_test.go
@@ -149,7 +149,7 @@ func TestTaskQueueBuilder_ApplyBuild(t *testing.T) {
 					InvInfo:   invInfo,
 					Objects:   object.UnstructuredSet{},
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:      "inventory-set-0",
 					InvClient:     &inventory.FakeClient{},
 					InvInfo:       invInfo,
@@ -183,7 +183,7 @@ func TestTaskQueueBuilder_ApplyBuild(t *testing.T) {
 					},
 					Condition: taskrunner.AllCurrent,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -234,7 +234,7 @@ func TestTaskQueueBuilder_ApplyBuild(t *testing.T) {
 					},
 					Condition: taskrunner.AllCurrent,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -298,7 +298,7 @@ func TestTaskQueueBuilder_ApplyBuild(t *testing.T) {
 					Condition: taskrunner.AllCurrent,
 					Timeout:   1 * time.Minute,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -356,7 +356,7 @@ func TestTaskQueueBuilder_ApplyBuild(t *testing.T) {
 					},
 					DryRunStrategy: common.DryRunClient,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -415,7 +415,7 @@ func TestTaskQueueBuilder_ApplyBuild(t *testing.T) {
 					},
 					DryRunStrategy: common.DryRunServer,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -492,7 +492,7 @@ func TestTaskQueueBuilder_ApplyBuild(t *testing.T) {
 					},
 					Condition: taskrunner.AllCurrent,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -567,7 +567,7 @@ func TestTaskQueueBuilder_ApplyBuild(t *testing.T) {
 					},
 					DryRunStrategy: common.DryRunClient,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -653,7 +653,7 @@ func TestTaskQueueBuilder_ApplyBuild(t *testing.T) {
 					},
 					Condition: taskrunner.AllCurrent,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -737,7 +737,7 @@ func TestTaskQueueBuilder_ApplyBuild(t *testing.T) {
 					},
 					Condition: taskrunner.AllCurrent,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -862,7 +862,7 @@ func TestTaskQueueBuilder_PruneBuild(t *testing.T) {
 					InvInfo:   invInfo,
 					Objects:   object.UnstructuredSet{},
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:      "inventory-set-0",
 					InvClient:     &inventory.FakeClient{},
 					InvInfo:       invInfo,
@@ -895,7 +895,7 @@ func TestTaskQueueBuilder_PruneBuild(t *testing.T) {
 					},
 					Condition: taskrunner.AllNotFound,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -943,7 +943,7 @@ func TestTaskQueueBuilder_PruneBuild(t *testing.T) {
 					},
 					Condition: taskrunner.AllNotFound,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -1014,7 +1014,7 @@ func TestTaskQueueBuilder_PruneBuild(t *testing.T) {
 					},
 					Condition: taskrunner.AllNotFound,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -1072,7 +1072,7 @@ func TestTaskQueueBuilder_PruneBuild(t *testing.T) {
 					Condition: taskrunner.AllNotFound,
 					Timeout:   3 * time.Minute,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -1119,7 +1119,7 @@ func TestTaskQueueBuilder_PruneBuild(t *testing.T) {
 					},
 					DryRunStrategy: common.DryRunServer,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -1192,7 +1192,7 @@ func TestTaskQueueBuilder_PruneBuild(t *testing.T) {
 					},
 					Condition: taskrunner.AllNotFound,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -1264,7 +1264,7 @@ func TestTaskQueueBuilder_PruneBuild(t *testing.T) {
 					},
 					DryRunStrategy: common.DryRunClient,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -1345,7 +1345,7 @@ func TestTaskQueueBuilder_PruneBuild(t *testing.T) {
 					},
 					Condition: taskrunner.AllNotFound,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -1439,7 +1439,7 @@ func TestTaskQueueBuilder_PruneBuild(t *testing.T) {
 					taskrunner.AllCurrent, 1*time.Second,
 					testutil.NewFakeRESTMapper(),
 				),
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -1574,7 +1574,7 @@ func TestTaskQueueBuilder_ApplyPruneBuild(t *testing.T) {
 					},
 					Condition: taskrunner.AllNotFound,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -1635,7 +1635,7 @@ func TestTaskQueueBuilder_ApplyPruneBuild(t *testing.T) {
 					},
 					Condition: taskrunner.AllCurrent,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -1709,7 +1709,7 @@ func TestTaskQueueBuilder_ApplyPruneBuild(t *testing.T) {
 					},
 					Condition: taskrunner.AllNotFound,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,
@@ -1789,7 +1789,7 @@ func TestTaskQueueBuilder_ApplyPruneBuild(t *testing.T) {
 					},
 					Condition: taskrunner.AllNotFound,
 				},
-				&task.InvSetTask{
+				&task.DeleteOrUpdateInvTask{
 					TaskName:  "inventory-set-0",
 					InvClient: &inventory.FakeClient{},
 					InvInfo:   invInfo,

diff --git a/pkg/apply/task/delete_inv_task.go b/pkg/apply/task/delete_inv_task.go