remove deprecated work execution clusterrolebinding (#992)

Signed-off-by: Zhiwei Yin <[email protected]>

Author: zhiweiyin318

manifests/klusterlet/managed/klusterlet-work-clusterrolebinding-execution.yaml

@@ -53,7 +53,7 @@ func TestSyncDelete(t *testing.T) {
 	}
 
 	// 11 managed static manifests + 12 management static manifests + 1 hub kubeconfig + 2 namespaces + 2 deployments
-	if len(deleteActions) != 29 {
+	if len(deleteActions) != 28 {
 		t.Errorf("Expected 28 delete actions, but got %d", len(deleteActions))
 	}
 
@@ -127,7 +127,7 @@ func TestSyncDeleteHosted(t *testing.T) {
 	}
 
 	// 12 static manifests + 2 namespaces
-	if len(deleteActionsManaged) != 15 {
+	if len(deleteActionsManaged) != 14 {
 		t.Errorf("Expected 14 delete actions, but got %d", len(deleteActionsManaged))
 	}
 

pkg/operator/operators/klusterlet/controllers/klusterletcontroller/klusterlet_cleanup_controller_test.go

@@ -28,24 +28,19 @@ import (
 	"open-cluster-management.io/ocm/pkg/operator/helpers"
 )
 
-var (
-	managedStaticResourceFiles = []string{
-		"klusterlet/managed/klusterlet-registration-serviceaccount.yaml",
-		"klusterlet/managed/klusterlet-registration-clusterrole.yaml",
-		"klusterlet/managed/klusterlet-registration-clusterrole-addon-management.yaml",
-		"klusterlet/managed/klusterlet-registration-clusterrolebinding.yaml",
-		"klusterlet/managed/klusterlet-registration-clusterrolebinding-addon-management.yaml",
-		"klusterlet/managed/klusterlet-work-serviceaccount.yaml",
-		"klusterlet/managed/klusterlet-work-clusterrole.yaml",
-		"klusterlet/managed/klusterlet-work-clusterrole-execution.yaml",
-		"klusterlet/managed/klusterlet-work-clusterrolebinding.yaml",
-		"klusterlet/managed/klusterlet-work-clusterrolebinding-aggregate.yaml",
-		"klusterlet/managed/klusterlet-work-clusterrolebinding-execution-admin.yaml",
-	}
-
-	cleanedManagedStaticResourceFiles = append(managedStaticResourceFiles,
-		"klusterlet/managed/klusterlet-work-clusterrolebinding-execution.yaml")
-)
+var managedStaticResourceFiles = []string{
+	"klusterlet/managed/klusterlet-registration-serviceaccount.yaml",
+	"klusterlet/managed/klusterlet-registration-clusterrole.yaml",
+	"klusterlet/managed/klusterlet-registration-clusterrole-addon-management.yaml",
+	"klusterlet/managed/klusterlet-registration-clusterrolebinding.yaml",
+	"klusterlet/managed/klusterlet-registration-clusterrolebinding-addon-management.yaml",
+	"klusterlet/managed/klusterlet-work-serviceaccount.yaml",
+	"klusterlet/managed/klusterlet-work-clusterrole.yaml",
+	"klusterlet/managed/klusterlet-work-clusterrole-execution.yaml",
+	"klusterlet/managed/klusterlet-work-clusterrolebinding.yaml",
+	"klusterlet/managed/klusterlet-work-clusterrolebinding-aggregate.yaml",
+	"klusterlet/managed/klusterlet-work-clusterrolebinding-execution-admin.yaml",
+}
 
 // managedReconcile apply resources to managed clusters
 type managedReconcile struct {
@@ -180,7 +175,7 @@ func (r *managedReconcile) clean(ctx context.Context, klusterlet *operatorapiv1.
 	}
 
 	if err := removeStaticResources(ctx, r.managedClusterClients.kubeClient, r.managedClusterClients.apiExtensionClient,
-		cleanedManagedStaticResourceFiles, config); err != nil {
+		managedStaticResourceFiles, config); err != nil {
 		return klusterlet, reconcileStop, err
 	}