diff --git a/components/README.md b/components/README.md index 986bceaafaa..28c888e9b16 100644 --- a/components/README.md +++ b/components/README.md @@ -35,7 +35,7 @@ can be found [here](https://github.com/opendatahub-io/opendatahub-operator/tree/ Cleanup(cli client.Client, DSCISpec *dsciv1.DSCInitializationSpec) error GetComponentName() string GetManagementState() operatorv1.ManagementState - OverrideManifests(platform string) error + OverrideManifests(platform cluster.Platform) error UpdatePrometheusConfig(cli client.Client, enable bool, component string) error ConfigComponentLogger(logger logr.Logger, component string, dscispec *dsciv1.DSCInitializationSpec) logr.Logger } diff --git a/components/codeflare/codeflare.go b/components/codeflare/codeflare.go index 6d2df29413a..bd440221319 100644 --- a/components/codeflare/codeflare.go +++ b/components/codeflare/codeflare.go @@ -35,7 +35,7 @@ type CodeFlare struct { components.Component `json:""` } -func (c *CodeFlare) OverrideManifests(_ string) error { +func (c *CodeFlare) OverrideManifests(_ cluster.Platform) error { // If devflags are set, update default manifests path if len(c.DevFlags.Manifests) != 0 { manifestConfig := c.DevFlags.Manifests[0] @@ -76,7 +76,7 @@ func (c *CodeFlare) ReconcileComponent(ctx context.Context, if enabled { if c.DevFlags != nil { // Download manifests and update paths - if err := c.OverrideManifests(string(platform)); err != nil { + if err := c.OverrideManifests(platform); err != nil { return err } } diff --git a/components/component.go b/components/component.go index 41d675a40c1..be11160cb6f 100644 --- a/components/component.go +++ b/components/component.go @@ -84,7 +84,7 @@ type ComponentInterface interface { Cleanup(cli client.Client, DSCISpec *dsciv1.DSCInitializationSpec) error GetComponentName() string GetManagementState() operatorv1.ManagementState - OverrideManifests(platform string) error + OverrideManifests(platform cluster.Platform) error UpdatePrometheusConfig(cli client.Client, enable bool, component string) error ConfigComponentLogger(logger logr.Logger, component string, dscispec *dsciv1.DSCInitializationSpec) logr.Logger } diff --git a/components/dashboard/dashboard.go b/components/dashboard/dashboard.go index d6cf50cfc8f..5cd05335fdf 100644 --- a/components/dashboard/dashboard.go +++ b/components/dashboard/dashboard.go @@ -25,21 +25,21 @@ import ( ) var ( - 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" + ConsoleLinkName = "console" + ConsoleLinkNS = "openshift-console" + + ComponentNameUpstream = "dashboard" + PathUpstream = deploy.DefaultManifestPath + "/" + ComponentNameUpstream + "/odh" + + ConsoleLinkPathUpstream = deploy.DefaultManifestPath + "/" + ComponentNameUpstream + "/consolelink" + + ComponentNameDownstream = "rhods-dashboard" + PathSelfDownstream = deploy.DefaultManifestPath + "/" + ComponentNameDownstream + "/rhoai/onprem" + PathManagedDownstream = deploy.DefaultManifestPath + "/" + ComponentNameDownstream + "/rhoai/addon" + + ConsoleLinkPathDownstream = deploy.DefaultManifestPath + "/" + ComponentNameDownstream + "/consolelink" + PathSupported = deploy.DefaultManifestPath + "/" + ComponentNameDownstream + "/rhoai/shared/base" // params.env + PathODHDashboardConfig = deploy.DefaultManifestPath + "/" + ComponentNameDownstream + "/rhoai/shared" // RHOAI odhdashboardconfig ) // Verifies that Dashboard implements ComponentInterface. @@ -51,26 +51,33 @@ type Dashboard struct { components.Component `json:""` } -func (d *Dashboard) OverrideManifests(platform string) error { - // If devflags are set, update default manifests path +func (d *Dashboard) OverrideManifests(platform cluster.Platform) error { if len(d.DevFlags.Manifests) != 0 { + ComponentName := ComponentNameUpstream manifestConfig := d.DevFlags.Manifests[0] + if err := deploy.DownloadManifests(ComponentName, manifestConfig); err != nil { return err } - // If overlay is defined, update paths - if platform == string(cluster.ManagedRhods) || platform == string(cluster.SelfManagedRhods) { - defaultKustomizePath := "overlays/rhoai" + switch platform { + case cluster.SelfManagedRhods: + defaultKustomizePath := "rhoai/onprem" if manifestConfig.SourcePath != "" { defaultKustomizePath = manifestConfig.SourcePath } - PathSupported = filepath.Join(deploy.DefaultManifestPath, ComponentName, defaultKustomizePath) - } else { - defaultKustomizePath := "base" + PathSelfDownstream = filepath.Join(deploy.DefaultManifestPath, ComponentName, defaultKustomizePath) + case cluster.ManagedRhods: + defaultKustomizePath := "rhoai/addon" if manifestConfig.SourcePath != "" { defaultKustomizePath = manifestConfig.SourcePath } - Path = filepath.Join(deploy.DefaultManifestPath, ComponentName, defaultKustomizePath) + PathManagedDownstream = filepath.Join(deploy.DefaultManifestPath, ComponentName, defaultKustomizePath) + default: + defaultKustomizePath := "odh" + if manifestConfig.SourcePath != "" { + defaultKustomizePath = manifestConfig.SourcePath + } + PathUpstream = filepath.Join(deploy.DefaultManifestPath, ComponentName, defaultKustomizePath) } } @@ -78,7 +85,7 @@ func (d *Dashboard) OverrideManifests(platform string) error { } func (d *Dashboard) GetComponentName() string { - return ComponentName + return ComponentNameUpstream } //nolint:gocyclo @@ -93,9 +100,9 @@ func (d *Dashboard) ReconcileComponent(ctx context.Context, var l logr.Logger if platform == cluster.SelfManagedRhods || platform == cluster.ManagedRhods { - l = d.ConfigComponentLogger(logger, ComponentNameSupported, dscispec) + l = d.ConfigComponentLogger(logger, ComponentNameDownstream, dscispec) } else { - l = d.ConfigComponentLogger(logger, ComponentName, dscispec) + l = d.ConfigComponentLogger(logger, ComponentNameUpstream, dscispec) } var imageParamMap = map[string]string{ @@ -113,16 +120,12 @@ func (d *Dashboard) ReconcileComponent(ctx context.Context, } if d.DevFlags != nil { // Download manifests and update paths - if err := d.OverrideManifests(string(platform)); err != nil { + if err := d.OverrideManifests(platform); err != nil { return err } } - // 1. Deploy CRDs - if err := d.deployCRDsForPlatform(cli, owner, dscispec.ApplicationsNamespace, platform); err != nil { - return fmt.Errorf("failed to deploy Dashboard CRD: %w", err) - } - // 2. platform specific RBAC + // platform specific RBAC if platform == cluster.OpenDataHub || platform == "" { err := cluster.UpdatePodSecurityRolebinding(ctx, cli, dscispec.ApplicationsNamespace, "odh-dashboard") if err != nil { @@ -153,32 +156,41 @@ func (d *Dashboard) ReconcileComponent(ctx context.Context, if err := cluster.CreateSecret(ctx, cli, "anaconda-ce-access", dscispec.ApplicationsNamespace); err != nil { return fmt.Errorf("failed to create access-secret for anaconda: %w", err) } - // overlay which including ../../base + anaconda-ce-validator - 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) - } - // Apply RHOAI specific configs, e.g anaconda screct and cronjob and ISV - if err := d.applyRHOAISpecificConfigs(cli, owner, dscispec.ApplicationsNamespace, platform); err != nil { - return err + // Deploy RHOAI manifests + + PathDownstream := PathSelfDownstream + if platform == cluster.ManagedRhods { + PathDownstream = PathManagedDownstream } - // consolelink - if err := d.deployConsoleLink(ctx, cli, owner, platform, dscispec.ApplicationsNamespace, ComponentNameSupported); err != nil { + // only update RHOAI specific configs + if enabled { + if err := d.updateRHOAISpecificConfigs(platform); err != nil { + return err + } + } + // only config consolelink + if err := d.configConsoleLink(ctx, cli, platform, dscispec.ApplicationsNamespace, ComponentNameDownstream); err != nil { return err } + + if err := deploy.DeployManifestsFromPath(cli, owner, PathDownstream, dscispec.ApplicationsNamespace, ComponentNameDownstream, enabled); err != nil { + return fmt.Errorf("failed to apply manifests from %s: %w", PathDownstream, err) + } + l.Info("apply manifests done") // CloudService Monitoring handling if platform == cluster.ManagedRhods { if enabled { // first check if the service is up, so prometheus won't fire alerts when it is just startup - if err := cluster.WaitForDeploymentAvailable(ctx, cli, ComponentNameSupported, dscispec.ApplicationsNamespace, 20, 3); err != nil { - return fmt.Errorf("deployment for %s is not ready to server: %w", ComponentName, err) + if err := cluster.WaitForDeploymentAvailable(ctx, cli, ComponentNameDownstream, dscispec.ApplicationsNamespace, 20, 3); err != nil { + return fmt.Errorf("deployment for %s is not ready to server: %w", ComponentNameDownstream, err) } l.Info("deployment is done, updating monitoring rules") } - if err := d.UpdatePrometheusConfig(cli, enabled && monitoringEnabled, ComponentNameSupported); err != nil { + if err := d.UpdatePrometheusConfig(cli, enabled && monitoringEnabled, ComponentNameDownstream); err != nil { return err } if err := deploy.DeployManifestsFromPath(cli, owner, @@ -191,35 +203,22 @@ func (d *Dashboard) ReconcileComponent(ctx context.Context, } return nil default: - // base - if err := deploy.DeployManifestsFromPath(cli, owner, Path, dscispec.ApplicationsNamespace, ComponentName, enabled); err != nil { - return err - } - // ISV - if err := deploy.DeployManifestsFromPath(cli, owner, PathISV, dscispec.ApplicationsNamespace, ComponentName, enabled); err != nil { + + // only update consolelink + if err := d.configConsoleLink(ctx, cli, platform, dscispec.ApplicationsNamespace, ComponentNameUpstream); err != nil { return err } - // consolelink - if err := d.deployConsoleLink(ctx, cli, owner, platform, dscispec.ApplicationsNamespace, ComponentName); err != nil { + // Deploy ODH manifests + if err := deploy.DeployManifestsFromPath(cli, owner, PathUpstream, dscispec.ApplicationsNamespace, ComponentNameUpstream, enabled); err != nil { return err } + l.Info("apply manifests done") return nil } } -func (d *Dashboard) deployCRDsForPlatform(cli client.Client, owner metav1.Object, namespace string, platform cluster.Platform) error { - componentName := ComponentName - if platform == cluster.SelfManagedRhods || platform == cluster.ManagedRhods { - componentName = ComponentNameSupported - } - // we only deploy CRD, we do not remove CRD - return deploy.DeployManifestsFromPath(cli, owner, PathCRDs, namespace, componentName, true) -} - -func (d *Dashboard) applyRHOAISpecificConfigs(cli client.Client, owner metav1.Object, namespace string, platform cluster.Platform) error { - enabled := d.ManagementState == operatorv1.Managed - +func (d *Dashboard) updateRHOAISpecificConfigs(platform cluster.Platform) error { // set proper group name dashboardConfig := filepath.Join(PathODHDashboardConfig, "odhdashboardconfig.yaml") adminGroups := map[cluster.Platform]string{ @@ -227,45 +226,34 @@ func (d *Dashboard) applyRHOAISpecificConfigs(cli client.Client, owner metav1.Ob cluster.ManagedRhods: "dedicated-admins", }[platform] - if err := common.ReplaceStringsInFile(dashboardConfig, map[string]string{"": adminGroups}); err != nil { - return err - } - if err := deploy.DeployManifestsFromPath(cli, owner, PathODHDashboardConfig, namespace, ComponentNameSupported, enabled); err != nil { - return fmt.Errorf("failed to create OdhDashboardConfig from %s: %w", PathODHDashboardConfig, err) - } - // ISV - path := PathISVSM - if platform == cluster.ManagedRhods { - path = PathISVAddOn - } - if err := deploy.DeployManifestsFromPath(cli, owner, path, namespace, ComponentNameSupported, enabled); err != nil { - return fmt.Errorf("failed to set dashboard ISV from %s : %w", Path, err) - } - return nil + err := common.ReplaceStringsInFile(dashboardConfig, map[string]string{"": adminGroups}) + return err } -func (d *Dashboard) deployConsoleLink(ctx context.Context, cli client.Client, owner metav1.Object, platform cluster.Platform, namespace, componentName string) error { +func (d *Dashboard) configConsoleLink(ctx context.Context, cli client.Client, platform cluster.Platform, namespace, componentName string) error { var manifestsPath, sectionTitle, routeName string switch platform { case cluster.SelfManagedRhods: sectionTitle = "OpenShift Self Managed Services" - manifestsPath = PathConsoleLinkSupported + manifestsPath = ConsoleLinkPathDownstream routeName = componentName + case cluster.ManagedRhods: sectionTitle = "OpenShift Managed Services" - manifestsPath = PathConsoleLinkSupported + manifestsPath = ConsoleLinkPathDownstream routeName = componentName + default: sectionTitle = "OpenShift Open Data Hub" - manifestsPath = PathConsoleLink + manifestsPath = ConsoleLinkPathUpstream routeName = "odh-dashboard" } pathConsoleLink := filepath.Join(manifestsPath, "consolelink.yaml") consoleRoute := &routev1.Route{} - if err := cli.Get(ctx, client.ObjectKey{Name: NameConsoleLink, Namespace: NamespaceConsoleLink}, consoleRoute); err != nil { - return fmt.Errorf("error getting console route URL %s : %w", NameConsoleLink, err) + if err := cli.Get(ctx, client.ObjectKey{Name: ConsoleLinkName, Namespace: ConsoleLinkNS}, consoleRoute); err != nil { + return fmt.Errorf("error getting console route URL %s : %w", ConsoleLinkName, err) } domainIndex := strings.Index(consoleRoute.Spec.Host, ".") @@ -277,11 +265,6 @@ func (d *Dashboard) deployConsoleLink(ctx context.Context, cli client.Client, ow return fmt.Errorf("error replacing with correct dashboard URL for consolelink : %w", err) } - enabled := d.ManagementState == operatorv1.Managed - if err := deploy.DeployManifestsFromPath(cli, owner, PathConsoleLink, namespace, componentName, enabled); err != nil { - return fmt.Errorf("failed to set dashboard consolelink %s : %w", pathConsoleLink, err) - } - return nil } diff --git a/components/datasciencepipelines/datasciencepipelines.go b/components/datasciencepipelines/datasciencepipelines.go index 0344ba039af..a377be70069 100644 --- a/components/datasciencepipelines/datasciencepipelines.go +++ b/components/datasciencepipelines/datasciencepipelines.go @@ -38,7 +38,7 @@ type DataSciencePipelines struct { components.Component `json:""` } -func (d *DataSciencePipelines) OverrideManifests(_ string) error { +func (d *DataSciencePipelines) OverrideManifests(_ cluster.Platform) error { // If devflags are set, update default manifests path if len(d.DevFlags.Manifests) != 0 { manifestConfig := d.DevFlags.Manifests[0] @@ -94,7 +94,7 @@ func (d *DataSciencePipelines) ReconcileComponent(ctx context.Context, if enabled { if d.DevFlags != nil { // Download manifests and update paths - if err := d.OverrideManifests(string(platform)); err != nil { + if err := d.OverrideManifests(platform); err != nil { return err } } diff --git a/components/kserve/kserve.go b/components/kserve/kserve.go index 9270cee72db..98fa3cfff7c 100644 --- a/components/kserve/kserve.go +++ b/components/kserve/kserve.go @@ -56,7 +56,7 @@ type Kserve struct { DefaultDeploymentMode DefaultDeploymentMode `json:"defaultDeploymentMode,omitempty"` } -func (k *Kserve) OverrideManifests(_ string) error { +func (k *Kserve) OverrideManifests(_ cluster.Platform) error { // Download manifests if defined by devflags // Go through each manifest and set the overlays if defined for _, subcomponent := range k.DevFlags.Manifests { @@ -119,7 +119,7 @@ func (k *Kserve) ReconcileComponent(ctx context.Context, cli client.Client, } if k.DevFlags != nil { // Download manifests and update paths - if err := k.OverrideManifests(string(platform)); err != nil { + if err := k.OverrideManifests(platform); err != nil { return err } } diff --git a/components/kueue/kueue.go b/components/kueue/kueue.go index 32f358608ec..b8456925b6a 100644 --- a/components/kueue/kueue.go +++ b/components/kueue/kueue.go @@ -31,7 +31,7 @@ type Kueue struct { components.Component `json:""` } -func (k *Kueue) OverrideManifests(_ string) error { +func (k *Kueue) OverrideManifests(_ cluster.Platform) error { // If devflags are set, update default manifests path if len(k.DevFlags.Manifests) != 0 { manifestConfig := k.DevFlags.Manifests[0] @@ -65,7 +65,7 @@ func (k *Kueue) ReconcileComponent(ctx context.Context, cli client.Client, logge if enabled { if k.DevFlags != nil { // Download manifests and update paths - if err := k.OverrideManifests(string(platform)); err != nil { + if err := k.OverrideManifests(platform); err != nil { return err } } diff --git a/components/modelmeshserving/modelmeshserving.go b/components/modelmeshserving/modelmeshserving.go index 7bd68c90ab9..60de7f100cc 100644 --- a/components/modelmeshserving/modelmeshserving.go +++ b/components/modelmeshserving/modelmeshserving.go @@ -35,7 +35,7 @@ type ModelMeshServing struct { components.Component `json:""` } -func (m *ModelMeshServing) OverrideManifests(_ string) error { +func (m *ModelMeshServing) OverrideManifests(_ cluster.Platform) error { // Go through each manifest and set the overlays if defined for _, subcomponent := range m.DevFlags.Manifests { if strings.Contains(subcomponent.URI, DependentComponentName) { @@ -100,7 +100,7 @@ func (m *ModelMeshServing) ReconcileComponent(ctx context.Context, if enabled { if m.DevFlags != nil { // Download manifests and update paths - if err := m.OverrideManifests(string(platform)); err != nil { + if err := m.OverrideManifests(platform); err != nil { return err } } diff --git a/components/modelregistry/modelregistry.go b/components/modelregistry/modelregistry.go index 69a19e60632..9817077e59b 100644 --- a/components/modelregistry/modelregistry.go +++ b/components/modelregistry/modelregistry.go @@ -36,7 +36,7 @@ type ModelRegistry struct { components.Component `json:""` } -func (m *ModelRegistry) OverrideManifests(_ string) error { +func (m *ModelRegistry) OverrideManifests(_ cluster.Platform) error { // If devflags are set, update default manifests path if len(m.DevFlags.Manifests) != 0 { manifestConfig := m.DevFlags.Manifests[0] @@ -71,7 +71,7 @@ func (m *ModelRegistry) ReconcileComponent(ctx context.Context, cli client.Clien if enabled { if m.DevFlags != nil { // Download manifests and update paths - if err := m.OverrideManifests(string(platform)); err != nil { + if err := m.OverrideManifests(platform); err != nil { return err } } diff --git a/components/ray/ray.go b/components/ray/ray.go index 13d850b6a2c..7568902a46d 100644 --- a/components/ray/ray.go +++ b/components/ray/ray.go @@ -33,7 +33,7 @@ type Ray struct { components.Component `json:""` } -func (r *Ray) OverrideManifests(_ string) error { +func (r *Ray) OverrideManifests(_ cluster.Platform) error { // If devflags are set, update default manifests path if len(r.DevFlags.Manifests) != 0 { manifestConfig := r.DevFlags.Manifests[0] @@ -70,7 +70,7 @@ func (r *Ray) ReconcileComponent(ctx context.Context, cli client.Client, logger if enabled { if r.DevFlags != nil { // Download manifests and update paths - if err := r.OverrideManifests(string(platform)); err != nil { + if err := r.OverrideManifests(platform); err != nil { return err } } diff --git a/components/trainingoperator/trainingoperator.go b/components/trainingoperator/trainingoperator.go index d7796a24915..af2fe51ad48 100644 --- a/components/trainingoperator/trainingoperator.go +++ b/components/trainingoperator/trainingoperator.go @@ -33,7 +33,7 @@ type TrainingOperator struct { components.Component `json:""` } -func (r *TrainingOperator) OverrideManifests(_ string) error { +func (r *TrainingOperator) OverrideManifests(_ cluster.Platform) error { // If devflags are set, update default manifests path if len(r.DevFlags.Manifests) != 0 { manifestConfig := r.DevFlags.Manifests[0] @@ -70,7 +70,7 @@ func (r *TrainingOperator) ReconcileComponent(ctx context.Context, cli client.Cl if enabled { if r.DevFlags != nil { // Download manifests and update paths - if err := r.OverrideManifests(string(platform)); err != nil { + if err := r.OverrideManifests(platform); err != nil { return err } } diff --git a/components/trustyai/trustyai.go b/components/trustyai/trustyai.go index 3f7a4bed7c4..72e16167412 100644 --- a/components/trustyai/trustyai.go +++ b/components/trustyai/trustyai.go @@ -33,7 +33,7 @@ type TrustyAI struct { components.Component `json:""` } -func (t *TrustyAI) OverrideManifests(_ string) error { +func (t *TrustyAI) OverrideManifests(_ cluster.Platform) error { // If devflags are set, update default manifests path if len(t.DevFlags.Manifests) != 0 { manifestConfig := t.DevFlags.Manifests[0] @@ -68,7 +68,7 @@ func (t *TrustyAI) ReconcileComponent(ctx context.Context, cli client.Client, lo if enabled { if t.DevFlags != nil { // Download manifests and update paths - if err := t.OverrideManifests(string(platform)); err != nil { + if err := t.OverrideManifests(platform); err != nil { return err } } diff --git a/components/workbenches/workbenches.go b/components/workbenches/workbenches.go index 7b5bef9037c..11859ce4fc4 100644 --- a/components/workbenches/workbenches.go +++ b/components/workbenches/workbenches.go @@ -40,7 +40,7 @@ type Workbenches struct { components.Component `json:""` } -func (w *Workbenches) OverrideManifests(platform string) error { +func (w *Workbenches) OverrideManifests(platform cluster.Platform) error { // Download manifests if defined by devflags // Go through each manifest and set the overlays if defined for _, subcomponent := range w.DevFlags.Manifests { @@ -56,7 +56,7 @@ func (w *Workbenches) OverrideManifests(platform string) error { defaultKustomizePath = subcomponent.SourcePath defaultKustomizePathSupported = subcomponent.SourcePath } - if platform == string(cluster.ManagedRhods) || platform == string(cluster.SelfManagedRhods) { + if platform == cluster.ManagedRhods || platform == cluster.SelfManagedRhods { notebookImagesPathSupported = filepath.Join(deploy.DefaultManifestPath, "jupyterhub", defaultKustomizePathSupported) } else { notebookImagesPath = filepath.Join(deploy.DefaultManifestPath, DependentComponentName, defaultKustomizePath) @@ -113,7 +113,7 @@ func (w *Workbenches) ReconcileComponent(ctx context.Context, cli client.Client, if enabled { if w.DevFlags != nil { // Download manifests and update paths - if err := w.OverrideManifests(string(platform)); err != nil { + if err := w.OverrideManifests(platform); err != nil { return err } } diff --git a/get_all_manifests.sh b/get_all_manifests.sh index 7907a4e8404..c59b39cafbb 100755 --- a/get_all_manifests.sh +++ b/get_all_manifests.sh @@ -10,7 +10,7 @@ declare -A COMPONENT_MANIFESTS=( ["ray"]="opendatahub-io:kuberay:dev:ray-operator/config:ray" ["kueue"]="opendatahub-io:kueue:dev:config:kueue" ["data-science-pipelines-operator"]="opendatahub-io:data-science-pipelines-operator:main:config:data-science-pipelines-operator" - ["odh-dashboard"]="opendatahub-io:odh-dashboard:main:manifests:dashboard" + ["odh-dashboard"]="andrewballantyne:odh-dashboard:restructure-manifests:manifests:dashboard" ["kf-notebook-controller"]="opendatahub-io:kubeflow:v1.7-branch:components/notebook-controller/config:odh-notebook-controller/kf-notebook-controller" ["odh-notebook-controller"]="opendatahub-io:kubeflow:v1.7-branch:components/odh-notebook-controller/config:odh-notebook-controller/odh-notebook-controller" ["notebooks"]="opendatahub-io:notebooks:main:manifests:notebooks"