fix(kserve): check on multiple depends operators if all pre-installed (…

…#744) (#119)

Signed-off-by: Wen Zhou <wenzhou@redhat.com>

components/kserve/kserve.go

@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/hashicorp/go-multierror"
 	operatorv1 "github.com/openshift/api/operator/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -97,28 +98,16 @@ func (k *Kserve) ReconcileComponent(cli client.Client, owner metav1.Object, dsci
 		if err := k.removeServerlessFeatures(dscispec); err != nil {
 			return err
 		}
-	}
-
-	if enabled {
+	} else {
 		// Download manifests and update paths
 		if err = k.OverrideManifests(string(platform)); err != nil {
 			return err
 		}
 
-		// check on dependent operators
-		if found, err := deploy.OperatorExists(cli, ServiceMeshOperator); err != nil {
-			return err
-		} else if !found {
-			return fmt.Errorf("operator %s not found. Please install the operator before enabling %s component",
-				ServiceMeshOperator, ComponentName)
-		}
-
-		// check on dependent operators might be in multiple namespaces
-		if found, err := deploy.OperatorExists(cli, ServerlessOperator); err != nil {
-			return err
-		} else if !found {
-			return fmt.Errorf("operator %s not found. Please install the operator before enabling %s component",
-				ServerlessOperator, ComponentName)
+		// check on dependent operators if all installed in cluster
+		dependOpsErrors := checkDepedentOps(cli).ErrorOrNil()
+		if dependOpsErrors != nil {
+			return dependOpsErrors
 		}
 
 		if err := k.configureServerless(dscispec); err != nil {
@@ -168,7 +157,7 @@ func (k *Kserve) Cleanup(_ client.Client, instance *dsciv1.DSCInitializationSpec
 func (k *Kserve) configureServerless(instance *dsciv1.DSCInitializationSpec) error {
 	if k.Serving.ManagementState == operatorv1.Managed {
 		if instance.ServiceMesh.ManagementState != operatorv1.Managed {
-			return fmt.Errorf("service mesh is not configure in DataScienceInitialization cluster but required by KServe serving")
+			return fmt.Errorf("serviceMesh is not configured as Managaed in DSCI instance but required by KServe serving")
 		}
 
 		serverlessInitializer := feature.NewFeaturesInitializer(instance, k.configureServerlessFeatures)
@@ -197,3 +186,24 @@ func (k *Kserve) removeServerlessFeatures(instance *dsciv1.DSCInitializationSpec
 	}
 	return nil
 }
+
+func checkDepedentOps(cli client.Client) *multierror.Error {
+	var multiErr *multierror.Error
+
+	if found, err := deploy.OperatorExists(cli, ServiceMeshOperator); err != nil {
+		multiErr = multierror.Append(multiErr, err)
+	} else if !found {
+		err = fmt.Errorf("operator %s not found. Please install the operator before enabling %s component",
+			ServiceMeshOperator, ComponentName)
+		multiErr = multierror.Append(multiErr, err)
+	}
+
+	if found, err := deploy.OperatorExists(cli, ServerlessOperator); err != nil {
+		multiErr = multierror.Append(multiErr, err)
+	} else if !found {
+		err = fmt.Errorf("operator %s not found. Please install the operator before enabling %s component",
+			ServerlessOperator, ComponentName)
+		multiErr = multierror.Append(multiErr, err)
+	}
+	return multiErr
+}

pkg/feature/feature.go

@@ -116,8 +116,7 @@ func (f *Feature) Cleanup() error {
 func (f *Feature) applyManifests() error {
 	var applyErrors *multierror.Error
 	for _, m := range f.manifests {
-		err := f.apply(m)
-		applyErrors = multierror.Append(applyErrors, err)
+		applyErrors = multierror.Append(applyErrors, f.apply(m))
 	}
 
 	return applyErrors.ErrorOrNil()

pkg/feature/initializer.go

@@ -34,8 +34,7 @@ func (s *FeaturesInitializer) Apply() error {
 	var applyErrors *multierror.Error
 
 	for _, f := range s.Features {
-		err := f.Apply()
-		applyErrors = multierror.Append(applyErrors, err)
+		applyErrors = multierror.Append(applyErrors, f.Apply())
 	}
 
 	return applyErrors.ErrorOrNil()