Only check if klusterlet to determine the cluster importing status (#483)

openshift-cherrypick-robot · zhujian7 · web-flow · commit f6579c3b8794 · 2025-02-11T03:27:32.000Z
Signed-off-by: zhujian &lt;jiazhu@redhat.com&gt;
Co-authored-by: zhujian &lt;jiazhu@redhat.com&gt;
diff --git a/pkg/controller/importstatus/importstatus_controller.go b/pkg/controller/importstatus/importstatus_controller.go
@@ -99,7 +99,7 @@ func (r *ReconcileImportStatus) Reconcile(ctx context.Context, request reconcile
 	}
 
 	available, err := helpers.IsManifestWorksAvailable(ctx, r.workClient, managedClusterName,
-		fmt.Sprintf("%s-%s", managedClusterName, constants.KlusterletCRDsSuffix),
+		// only check if the klusterlet is available, check the klusterlet-crd will break the no-operator mode
 		fmt.Sprintf("%s-%s", managedClusterName, constants.KlusterletSuffix))
 	if err != nil {
 		reqLogger.V(5).Info("Check klusterlet manifestworks availability failed", "error", err)

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ func (r *ReconcileImportStatus) Reconcile(ctx context.Context, request reconcile`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`available, err := helpers.IsManifestWorksAvailable(ctx, r.workClient, managedClusterName,`
`102`		`- fmt.Sprintf("%s-%s", managedClusterName, constants.KlusterletCRDsSuffix),`
	`102`	`+ // only check if the klusterlet is available, check the klusterlet-crd will break the no-operator mode`
`103`	`103`	`fmt.Sprintf("%s-%s", managedClusterName, constants.KlusterletSuffix))`
`104`	`104`	`if err != nil {`
`105`	`105`	`reqLogger.V(5).Info("Check klusterlet manifestworks availability failed", "error", err)`