fix(platform): set owner reference leverage GC delete object (#850)

tkestack · Oct 24, 2020 · ca4c664 · ca4c664
1 parent 9b8eaff
commit ca4c664
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/pkg/platform/controller/cluster/cluster_controller.go b/pkg/platform/controller/cluster/cluster_controller.go
@@ -344,7 +344,12 @@ func (c *Controller) ensureCreateClusterCredential(ctx context.Context, cluster
 	credential := &platformv1.ClusterCredential{
 		TenantID:    cluster.Spec.TenantID,
 		ClusterName: cluster.Name,
+		ObjectMeta: metav1.ObjectMeta{
+			OwnerReferences: []metav1.OwnerReference{
+				*metav1.NewControllerRef(cluster, platformv1.SchemeGroupVersion.WithKind("Cluster"))},
+		},
 	}
+
 	credential, err = c.platformClient.ClusterCredentials().Create(ctx, credential, metav1.CreateOptions{})
 	if err != nil {
 		return nil, err

diff --git a/pkg/platform/controller/cluster/deletion/cluster_deleter.go b/pkg/platform/controller/cluster/deletion/cluster_deleter.go
@@ -246,7 +246,6 @@ var deleteResourceFuncs = []deleteResourceFunc{
 	deleteTappControllers,
 	deleteClusterProvider,
 	deleteMachine,
-	deleteClusterCredential,
 }
 
 // deleteAllContent will use the client to delete each resource identified in cluster.
@@ -405,6 +404,7 @@ func deleteClusterProvider(ctx context.Context, deleter *clusterDeleter, cluster
 	return nil
 }
 
+/*
 func deleteClusterCredential(ctx context.Context, deleter *clusterDeleter, cluster *platformv1.Cluster) error {
 	log.FromContext(ctx).Info("deleteClusterCredential doing")
 
@@ -433,6 +433,7 @@ func deleteClusterCredential(ctx context.Context, deleter *clusterDeleter, clust
 
 	return nil
 }
+*/
 
 func deleteMachine(ctx context.Context, deleter *clusterDeleter, cluster *platformv1.Cluster) error {
 	log.FromContext(ctx).Info("deleteMachine doing")