Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update: workbench images into 2 params.env files #84

Merged
merged 1 commit into from
Oct 25, 2023
Merged

update: workbench images into 2 params.env files #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions components/workbenches/workbenches.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var (
DependentComponentName = "notebooks"
// manifests for nbc in ODH and downstream + downstream use it for imageparams
notebookControllerPath = deploy.DefaultManifestPath + "/odh-notebook-controller/odh-notebook-controller/base"
// manifests for ODH nbc
// manifests for ODH nbc + downstream use it for imageparams
kfnotebookControllerPath = deploy.DefaultManifestPath + "/odh-notebook-controller/kf-notebook-controller/overlays/openshift"
notebookImagesPath = deploy.DefaultManifestPath + "/notebooks/overlays/additional"
notebookImagesPathSupported = deploy.DefaultManifestPath + "/jupyterhub/notebooks/base"
Expand Down Expand Up @@ -135,10 +135,14 @@ func (w *Workbenches) ReconcileComponent(cli client.Client, owner metav1.Object,
if enabled {
if dscispec.DevFlags.ManifestsUri == "" && len(w.DevFlags.Manifests) == 0 {
if platform == deploy.ManagedRhods || platform == deploy.SelfManagedRhods {
// TODO: fix for nbc new path if want to split into two params.env
// for kf-notebook-controller image
if err := deploy.ApplyParams(notebookControllerPath, w.SetImageParamsMap(imageParamMap), false); err != nil {
return err
}
// for odh-notebook-controller image
if err := deploy.ApplyParams(kfnotebookControllerPath, w.SetImageParamsMap(imageParamMap), false); err != nil {
return err
}
}
}
}
Expand Down
Loading