Fix: delete addon crd at first (open-cluster-management-io#277)

This is to ensure manifestwork of addon is deleted at first. Signed-off-by: Jian Qiu <jqiu@redhat.com> Signed-off-by: Jian Qiu <jqiu@redhat.com>
TomerFi · Sep 28, 2022 · 79c6b55 · 79c6b55
1 parent 0944f98
commit 79c6b55
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...perators/clustermanager/controllers/clustermanagercontroller/clustermanager_controller.go b/...perators/clustermanager/controllers/clustermanagercontroller/clustermanager_controller.go
@@ -35,7 +35,11 @@ import (
 )
 
 var (
+	// crdNames is the list of CRDs to be wiped out before deleting other resources when clusterManager is deleted.
+	// The order of the list matters, the managedclusteraddon crd needs to be deleted at first so all addon related
+	// manifestwork is deleted, then other manifestworks.
 	crdNames = []string{
+		"managedclusteraddons.addon.open-cluster-management.io",
 		"manifestworks.work.open-cluster-management.io",
 		"managedclusters.cluster.open-cluster-management.io",
 	}

diff --git a/...ors/clustermanager/controllers/clustermanagercontroller/clustermanager_controller_test.go b/...ors/clustermanager/controllers/clustermanagercontroller/clustermanager_controller_test.go
@@ -222,7 +222,7 @@ func TestSyncDelete(t *testing.T) {
 		}
 	}
 	// Check if resources are created as expected
-	testinghelper.AssertEqualNumber(t, len(deleteCRDActions), 12)
+	testinghelper.AssertEqualNumber(t, len(deleteCRDActions), 13)
 
 	deleteAPIServiceActions := []clienttesting.DeleteActionImpl{}
 	apiServiceActions := tc.apiRegistrationClient.Actions()