From 55320b6606d26046beaffd91132f54ecf1762e97 Mon Sep 17 00:00:00 2001 From: Wen Zhou Date: Thu, 2 May 2024 16:32:26 +0200 Subject: [PATCH] chore(cleanup): remove checkDependentOperators as duplicated logic (#996) - both depedent operators have been check in configureServerlessFeatures Signed-off-by: Wen Zhou --- components/kserve/kserve_config_handler.go | 31 +--------------------- 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/components/kserve/kserve_config_handler.go b/components/kserve/kserve_config_handler.go index 4818151b483..3bc91db1657 100644 --- a/components/kserve/kserve_config_handler.go +++ b/components/kserve/kserve_config_handler.go @@ -5,13 +5,11 @@ import ( "encoding/json" "fmt" - "github.com/hashicorp/go-multierror" operatorv1 "github.com/openshift/api/operator/v1" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" dsciv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1" - "github.com/opendatahub-io/opendatahub-operator/v2/pkg/deploy" "github.com/opendatahub-io/opendatahub-operator/v2/pkg/feature" "github.com/opendatahub-io/opendatahub-operator/v2/pkg/metadata/labels" ) @@ -116,7 +114,7 @@ func (k *Kserve) setDefaultDeploymentMode(ctx context.Context, cli client.Client return nil } -func (k *Kserve) configureServerless(cli client.Client, instance *dsciv1.DSCInitializationSpec) error { +func (k *Kserve) configureServerless(_ client.Client, instance *dsciv1.DSCInitializationSpec) error { switch k.Serving.ManagementState { case operatorv1.Unmanaged: // Bring your own CR fmt.Println("Serverless CR is not configured by the operator, we won't do anything") @@ -133,12 +131,6 @@ func (k *Kserve) configureServerless(cli client.Client, instance *dsciv1.DSCInit return fmt.Errorf("ServiceMesh is need to set to 'Managed' in DSCI CR, it is required by KServe serving field") } - // check on dependent operators if all installed in cluster - dependOpsErrors := checkDependentOperators(cli).ErrorOrNil() - if dependOpsErrors != nil { - return dependOpsErrors - } - serverlessFeatures := feature.ComponentFeaturesHandler(k.GetComponentName(), instance, k.configureServerlessFeatures()) if err := serverlessFeatures.Apply(); err != nil { @@ -153,24 +145,3 @@ func (k *Kserve) removeServerlessFeatures(instance *dsciv1.DSCInitializationSpec return serverlessFeatures.Delete() } - -func checkDependentOperators(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 -}