Remove cleanup of deployables (#88)

* Remove cleanup of deployables Signed-off-by: Philip Wu <phwu@redhat.com> * Fix placement test Signed-off-by: Philip Wu <phwu@redhat.com>
open-cluster-management-io · Feb 17, 2022 · 1d49987 · 1d49987
1 parent bbcc640
commit 1d49987
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/pkg/controller/mcmhub/hub.go b/pkg/controller/mcmhub/hub.go
@@ -134,13 +134,6 @@ func (r *ReconcileSubscription) doMCMHubReconcile(sub *appv1alpha1.Subscription)
 	}
 
 	err = r.PropagateAppSubManifestWork(sub, clusters)
-	if err == nil {
-		// Cleanup deployables that were created pre-ACM 2.5
-		if err := r.cleanupDeployables(sub); err != nil {
-			// Log error only
-			klog.Warning(err, "Error cleaning up deployables")
-		}
-	}
 
 	return err
 }

diff --git a/pkg/placementrule/controller/placementrule/placementrule_controller_test.go b/pkg/placementrule/controller/placementrule/placementrule_controller_test.go
@@ -504,7 +504,7 @@ func TestClusterChange(t *testing.T) {
 
 	g.Eventually(requests, timeout).Should(gomega.Receive(gomega.Equal(expectedRequest)))
 
-	time.Sleep(8 * time.Second)
+	time.Sleep(10 * time.Second)
 
 	err = c.Get(context.TODO(), prulekey, result)
 	g.Expect(err).NotTo(gomega.HaveOccurred())