diff --git a/helm/reana/README.md b/helm/reana/README.md index 0119b054..e5f504a3 100644 --- a/helm/reana/README.md +++ b/helm/reana/README.md @@ -134,5 +134,7 @@ This Helm automatically prefixes all names using the release name to avoid colli | `workspaces.retention_rules.cronjob_schedule` | Cron format string describing how often pending retention rules should be applied. | "0 2 * * *" | | `workspaces.paths` | List of additional workspace paths as strings. Each mount string is composed by a key `hostPath`(path to the directory to be mounted from the Kubernetes nodes) and a cluster_pod_mountpath (path inside the cluster containers where the `mountPath` will be mounted) e.g. `hostPath:mountPath`. The first value listed will be the default workspace root path. Any POSIX filesystem mounted on cluster nodes is supported | None | | `interactive_sessions.cronjob_schedule` | Cron format string describing how often interactive session cleanup should be performed. | "0 3 * * *" | +| `interactive_sessions.environments.jupyter.recommended` | List of recommended environments (container images) for Jupyter notebooks. Each environment is composed of a `name` and an `image`. The first environment in the list is the default one. | `[{"image": "docker.io/jupyter/scipy-notebook:notebook-6.4.5", "name": "Jupyter SciPy Notebook 6.4.5"}]` | +| `interactive_sessions.environments.jupyter.allow_custom` | Allow users to specify custom docker images for Jupyter notebooks. | false | | `interactive_sessions.maximum_inactivity_period` | Set a limit in days for the maximum inactivity period of interactive sessions. After this period interactive sessions will be automatically closed. To disable autoclosure and allow interactive sessions to run forever, use value "forever". | forever | | `components.reana_ui.launcher_examples` | Array of demo examples to show in the launch page in the UI. Each demo repository is composed of `name`, `url`, `image_url`; you can also optionally specify a `description` and the `specification` filename. | [] | diff --git a/helm/reana/templates/reana-config.yaml b/helm/reana/templates/reana-config.yaml index 6e7555e2..ff209a0e 100644 --- a/helm/reana/templates/reana-config.yaml +++ b/helm/reana/templates/reana-config.yaml @@ -45,3 +45,6 @@ data: image_url: {{ .image_url | quote }} specification: {{ .specification | quote }} {{- end }} + interactive_sessions: + environments: + {{- .Values.interactive_sessions.environments | toYaml | nindent 8 }} diff --git a/helm/reana/templates/reana-workflow-controller.yaml b/helm/reana/templates/reana-workflow-controller.yaml index c816fe60..273da6fc 100644 --- a/helm/reana/templates/reana-workflow-controller.yaml +++ b/helm/reana/templates/reana-workflow-controller.yaml @@ -164,6 +164,8 @@ spec: # Environment variables for job controller - name: REANA_JOB_CONTROLLER_ENV_VARS value: {{ .Values.components.reana_job_controller.environment | toJson | quote }} + - name: REANA_INTERACTIVE_SESSIONS_ENVIRONMENTS + value: {{ .Values.interactive_sessions.environments | toJson | quote }} {{- if .Values.reana_hostname }} - name: REANA_HOSTNAME value: {{ .Values.reana_hostname }} diff --git a/helm/reana/values.yaml b/helm/reana/values.yaml index ff886025..5e8cbf8c 100644 --- a/helm/reana/values.yaml +++ b/helm/reana/values.yaml @@ -22,6 +22,12 @@ workspaces: interactive_sessions: cronjob_schedule: "0 3 * * *" # everyday at 3am + environments: + jupyter: + recommended: + - image: "docker.io/jupyter/scipy-notebook:notebook-6.4.5" + name: "Jupyter SciPy Notebook 6.4.5" + allow_custom: false maximum_inactivity_period: forever compute_backends: