run all api check before returning, add olm api check before register, keep the check and register pattern same for all conditional api registration

assisted-by: claude-code for code,planning
Signed-off-by: Anand Kumar Singh <anandrkskd@gmail.com>

Author: anandrkskd

cmd/main.go

@@ -213,8 +213,12 @@ func main() {
 		registerComponentOrExit(mgr, monitoringv1.AddToScheme)
 	}
 
-	registerComponentOrExit(mgr, operatorsv1.AddToScheme)
-	registerComponentOrExit(mgr, operatorsv1alpha1.AddToScheme)
+	// Setup Scheme for OLM if available (verified by InspectCluster)
+	if util.IsOLMAPIFound() {
+		registerComponentOrExit(mgr, operatorsv1.AddToScheme)
+		registerComponentOrExit(mgr, operatorsv1alpha1.AddToScheme)
+	}
+
 	registerComponentOrExit(mgr, argov1alpha1api.AddToScheme)
 	registerComponentOrExit(mgr, argov1beta1api.AddToScheme)
 
@@ -225,27 +229,18 @@ func main() {
 
 	registerComponentOrExit(mgr, rolloutManagerApi.AddToScheme)
 
-	// Setup Scheme for OpenShift Template if available
-	if found, err := argoutil.VerifyAPI(templatev1.GroupName, templatev1.GroupVersion.Version); err != nil {
-		setupLog.Error(err, "unable to verify Template API")
-		os.Exit(1)
-	} else if found {
+	// Setup Scheme for OpenShift Template if available (verified by InspectCluster)
+	if util.IsTemplateAPIFound() {
 		registerComponentOrExit(mgr, templatev1.AddToScheme)
 	}
 
-	// Setup Scheme for OpenShift Apps if available
-	if found, err := argoutil.VerifyAPI(appsv1.GroupName, appsv1.GroupVersion.Version); err != nil {
-		setupLog.Error(err, "unable to verify Apps API")
-		os.Exit(1)
-	} else if found {
+	// Setup Scheme for OpenShift Apps if available (verified by InspectCluster)
+	if util.IsAppsAPIFound() {
 		registerComponentOrExit(mgr, appsv1.AddToScheme)
 	}
 
-	// Setup Scheme for OpenShift OAuth if available
-	if found, err := argoutil.VerifyAPI(oauthv1.GroupName, oauthv1.GroupVersion.Version); err != nil {
-		setupLog.Error(err, "unable to verify OAuth API")
-		os.Exit(1)
-	} else if found {
+	// Setup Scheme for OpenShift OAuth if available (verified by InspectCluster)
+	if util.IsOAuthAPIFound() {
 		registerComponentOrExit(mgr, oauthv1.AddToScheme)
 	}
 

controllers/argocd_controller.go

@@ -71,8 +71,9 @@ func isConsoleLinkDisabled() bool {
 
 // SetupWithManager sets up the controller with the Manager.
 func (r *ReconcileArgoCDRoute) SetupWithManager(mgr ctrl.Manager) error {
-	// Watch for changes to argocd-server route in the default argocd instance namespace
-	// The ConsoleLink holds the route URL and should be regenerated when route is updated
+	if !util.IsRouteAPIFound() {
+		return nil
+	}
 
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&routev1.Route{}, builder.WithPredicates(filterPredicate(filterArgoCDRoute))).

controllers/gitopsservice_controller.go

@@ -221,6 +221,7 @@ func (r *ReconcileGitopsService) Reconcile(ctx context.Context, request reconcil
 	reqLogger := logs.WithValues("Request.Namespace", request.Namespace, "Request.Name", request.Name)
 	reqLogger.Info("Reconciling GitopsService")
 
+	// Fetch the GitopsService instance
 	instance := &pipelinesv1alpha1.GitopsService{}
 	err := r.Client.Get(ctx, types.NamespacedName{Name: serviceName}, instance)
 	if err != nil {

controllers/gitopsservice_controller_test.go

@@ -52,6 +52,7 @@ import (
 func TestMain(m *testing.M) {
 	util.SetOpenShiftClusterFound(true)
 	util.SetMonitoringAPIFound(true)
+	util.SetRouteAPIFound(true)
 	os.Exit(m.Run())
 }
 

controllers/util/test_util.go

@@ -34,3 +34,23 @@ func SetConsoleAPIFound(found bool) {
 func SetRouteAPIFound(found bool) {
 	routeAPIFound = found
 }
+
+// *** THIS SHOULD ONLY BE USED FOR UNIT TESTING ***
+func SetTemplateAPIFound(found bool) {
+	templateAPIFound = found
+}
+
+// *** THIS SHOULD ONLY BE USED FOR UNIT TESTING ***
+func SetAppsAPIFound(found bool) {
+	appsAPIFound = found
+}
+
+// *** THIS SHOULD ONLY BE USED FOR UNIT TESTING ***
+func SetOAuthAPIFound(found bool) {
+	oauthAPIFound = found
+}
+
+// *** THIS SHOULD ONLY BE USED FOR UNIT TESTING ***
+func SetOLMAPIFound(found bool) {
+	olmAPIFound = found
+}

controllers/util/util.go

@@ -18,14 +18,19 @@ package util
 
 import (
 	"context"
+	stderrors "errors"
 	"fmt"
 	"os"
 	"strings"
 
 	"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
+	oappsv1 "github.com/openshift/api/apps/v1"
 	configv1 "github.com/openshift/api/config/v1"
 	console "github.com/openshift/api/console/v1"
+	oauthv1 "github.com/openshift/api/oauth/v1"
 	routev1 "github.com/openshift/api/route/v1"
+	templatev1 "github.com/openshift/api/template/v1"
+	operatorsv1 "github.com/operator-framework/api/pkg/operators/v1"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	"golang.org/x/mod/semver"
 	corev1 "k8s.io/api/core/v1"
@@ -44,6 +49,10 @@ var (
 	routeAPIFound         = false
 	monitoringAPIFound    = false
 	openShiftClusterFound = false
+	templateAPIFound      = false
+	appsAPIFound          = false
+	oauthAPIFound         = false
+	olmAPIFound           = false
 )
 
 // GetClusterVersion returns the OpenShift Cluster version in which the operator is installed
@@ -80,16 +89,25 @@ func InspectCluster() error {
 	if err := verifyOpenShiftCluster(); err != nil {
 		return err
 	}
-	if err := verifyRouteAPI(); err != nil {
-		return err
-	}
-	if err := verifyConsoleAPI(); err != nil {
-		return err
+	if !openShiftClusterFound {
+		return nil
 	}
-	if err := verifyMonitoringAPI(); err != nil {
-		return err
+
+	var errs []error
+	for _, check := range []func() error{
+		verifyRouteAPI,
+		verifyConsoleAPI,
+		verifyMonitoringAPI,
+		verifyTemplateAPI,
+		verifyAppsAPI,
+		verifyOAuthAPI,
+		verifyOLMAPI,
+	} {
+		if err := check(); err != nil {
+			errs = append(errs, err)
+		}
 	}
-	return nil
+	return stderrors.Join(errs...)
 }
 
 func IsOpenShiftCluster() bool {
@@ -147,6 +165,58 @@ func IsMonitoringAPIFound() bool {
 	return monitoringAPIFound
 }
 
+func IsTemplateAPIFound() bool {
+	return templateAPIFound
+}
+
+func verifyTemplateAPI() error {
+	found, err := argoutil.VerifyAPI(templatev1.GroupName, templatev1.GroupVersion.Version)
+	if err != nil {
+		return err
+	}
+	templateAPIFound = found
+	return nil
+}
+
+func IsAppsAPIFound() bool {
+	return appsAPIFound
+}
+
+func verifyAppsAPI() error {
+	found, err := argoutil.VerifyAPI(oappsv1.GroupName, oappsv1.GroupVersion.Version)
+	if err != nil {
+		return err
+	}
+	appsAPIFound = found
+	return nil
+}
+
+func IsOAuthAPIFound() bool {
+	return oauthAPIFound
+}
+
+func verifyOAuthAPI() error {
+	found, err := argoutil.VerifyAPI(oauthv1.GroupName, oauthv1.GroupVersion.Version)
+	if err != nil {
+		return err
+	}
+	oauthAPIFound = found
+	return nil
+}
+
+func IsOLMAPIFound() bool {
+	return olmAPIFound
+}
+
+func verifyOLMAPI() error {
+	found, err := argoutil.VerifyAPI(operatorsv1.GroupVersion.Group, operatorsv1.GroupVersion.Version)
+	if err != nil {
+		return err
+	}
+	olmAPIFound = found
+	return nil
+}
+
 func ProxyEnvVars(vars ...corev1.EnvVar) []corev1.EnvVar {
 	result := []corev1.EnvVar{}
 	result = append(result, vars...)