diff --git a/components/dashboard/dashboard.go b/components/dashboard/dashboard.go index 49de9ae7106..eb0dc1b61e2 100644 --- a/components/dashboard/dashboard.go +++ b/components/dashboard/dashboard.go @@ -25,20 +25,18 @@ import ( ) var ( - ComponentName = "dashboard" - Path = deploy.DefaultManifestPath + "/" + ComponentName + "/base" // ODH - PathISV = deploy.DefaultManifestPath + "/" + ComponentName + "/apps" // ODH APPS - PathModelServing = deploy.DefaultManifestPath + "/" + ComponentName + "/modelserving" // ODH modelserving - PathCRDs = deploy.DefaultManifestPath + "/" + ComponentName + "/crd" // ODH + RHOAI - PathConsoleLink = deploy.DefaultManifestPath + "/" + ComponentName + "/consolelink" // ODH consolelink - - ComponentNameSupported = "rhods-dashboard" - PathSupported = deploy.DefaultManifestPath + "/" + ComponentName + "/overlays/rhoai" // RHOAI - PathSupportedModelServing = deploy.DefaultManifestPath + "/" + ComponentName + "/overlays/modelserving" // RHOAI modelserving - PathISVSM = deploy.DefaultManifestPath + "/" + ComponentName + "/overlays/apps/apps-onprem" // RHOAI APPS - PathISVAddOn = deploy.DefaultManifestPath + "/" + ComponentName + "/overlays/apps/apps-addon" // RHOAI APPS - PathConsoleLinkSupported = deploy.DefaultManifestPath + "/" + ComponentName + "/overlays/consolelink" // RHOAI - PathODHDashboardConfig = deploy.DefaultManifestPath + "/" + ComponentName + "/overlays/odhdashboardconfig" // RHOAI odhdashboardconfig + ComponentName = "dashboard" + Path = deploy.DefaultManifestPath + "/" + ComponentName + "/base" // ODH + PathISV = deploy.DefaultManifestPath + "/" + ComponentName + "/apps" // ODH APPS + PathCRDs = deploy.DefaultManifestPath + "/" + ComponentName + "/crd" // ODH + RHOAI + PathConsoleLink = deploy.DefaultManifestPath + "/" + ComponentName + "/consolelink" // ODH consolelink + + ComponentNameSupported = "rhods-dashboard" + PathSupported = deploy.DefaultManifestPath + "/" + ComponentName + "/overlays/rhoai" // RHOAI + PathISVSM = deploy.DefaultManifestPath + "/" + ComponentName + "/overlays/apps/apps-onprem" // RHOAI APPS + PathISVAddOn = deploy.DefaultManifestPath + "/" + ComponentName + "/overlays/apps/apps-addon" // RHOAI APPS + PathConsoleLinkSupported = deploy.DefaultManifestPath + "/" + ComponentName + "/overlays/consolelink" // RHOAI + PathODHDashboardConfig = deploy.DefaultManifestPath + "/" + ComponentName + "/overlays/odhdashboardconfig" // RHOAI odhdashboardconfig NameConsoleLink = "console" NamespaceConsoleLink = "openshift-console" @@ -161,10 +159,6 @@ func (d *Dashboard) ReconcileComponent(ctx context.Context, if err := deploy.DeployManifestsFromPath(cli, owner, PathSupported, dscispec.ApplicationsNamespace, ComponentNameSupported, enabled); err != nil { return fmt.Errorf("failed to apply manifests from %s: %w", PathSupported, err) } - // modelserving - if err := deploy.DeployManifestsFromPath(cli, owner, PathSupportedModelServing, dscispec.ApplicationsNamespace, ComponentNameSupported, enabled); err != nil { - return fmt.Errorf("failed to set dashboard modelserving from %s: %w", PathSupportedModelServing, err) - } // Apply RHOAI specific configs, e.g anaconda screct and cronjob and ISV if err := d.applyRHOAISpecificConfigs(cli, owner, dscispec.ApplicationsNamespace, platform); err != nil { @@ -207,10 +201,6 @@ func (d *Dashboard) ReconcileComponent(ctx context.Context, if err = deploy.DeployManifestsFromPath(cli, owner, PathISV, dscispec.ApplicationsNamespace, ComponentName, enabled); err != nil { return err } - // modelserving - if err := deploy.DeployManifestsFromPath(cli, owner, PathModelServing, dscispec.ApplicationsNamespace, ComponentName, enabled); err != nil { - return fmt.Errorf("failed to set dashboard modelserving from %s: %w", PathModelServing, err) - } // consolelink if err := d.deployConsoleLink(ctx, cli, owner, platform, dscispec.ApplicationsNamespace, ComponentName); err != nil { return err