ensure the klusterlet namespace early

Signed-off-by: zhujian <jiazhu@redhat.com>
open-cluster-management-io · Dec 24, 2021 · c74c9f3 · c74c9f3
1 parent 73cf438
commit c74c9f3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/deploy/klusterlet/config/rbac/cluster_role.yaml b/deploy/klusterlet/config/rbac/cluster_role.yaml
@@ -42,4 +42,4 @@ rules:
 # Allow the registration-operator to update the appliedmanifestworks finalizer.
 - apiGroups: ["work.open-cluster-management.io"]
   resources: ["appliedmanifestworks"]
-  verbs: ["get", "list", "watch", "update"]
+  verbs: ["list", "update"]
diff --git a/pkg/operators/klusterlet/controllers/klusterletcontroller/klusterlet_controller.go b/pkg/operators/klusterlet/controllers/klusterletcontroller/klusterlet_controller.go
@@ -589,6 +589,13 @@ func (n *klusterletController) cleanUp(
 		return err
 	}
 
+	// remove AppliedManifestWorks, should be executed **before** "remove the CRDs" and "remove hub kubeconfig secret"
+	if len(hubHost) > 0 {
+		if err := n.cleanUpAppliedManifestWorks(ctx, managedClients.appliedManifestWorkClient, hubHost); err != nil {
+			return err
+		}
+	}
+
 	// Remove secrets
 	secrets := []string{config.HubKubeConfigSecret}
 	if config.InstallMode == operatorapiv1.InstallModeDetached {
@@ -638,13 +645,6 @@ func (n *klusterletController) cleanUp(
 		}
 	}
 
-	// remove AppliedManifestWorks, should be executed **before** "remove the CRDs"
-	if len(hubHost) > 0 {
-		if err := n.cleanUpAppliedManifestWorks(ctx, managedClients.appliedManifestWorkClient, hubHost); err != nil {
-			return err
-		}
-	}
-
 	// remove the CRDs
 	var crdStaticFiles []string
 	// CRD v1beta1 was deprecated from k8s 1.16.0 and will be removed in k8s 1.22