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.

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

feat(helm): add value to customise env vars of job controller and workflow engines (#781) #781

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions helm/reana/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ This Helm automatically prefixes all names using the release name to avoid colli
|----------------------------------------------------------|--------------------------------------------------------------------------------------|-------------------------------------------------|
| `components.reana_db.enabled` | Instantiate a PostgreSQL database inside the cluster | true |
| `components.reana_db.image` | [PostgreSQL image](https://hub.docker.com/_/postgres) to use | `docker.io/library/postgres:12.13` |
| `components.reana_job_controller.environment` | [REANA-Job-Controller](https://github.com/reanahub/reana-job-controller) environment variables | `{}` |
| `components.reana_job_controller.image` | [REANA-Job-Controller image](https://hub.docker.com/r/reanahub/reana-job-controller) to use | `docker.io/reanahub/reana-job-controller:<chart-release-version>` |
| `components.reana_message_broker.image` | [REANA-Message-Broker image](https://hub.docker.com/r/reanahub/reana-message-broker) to use | `docker.io/reanahub/reana-message-broker:<chart-release-version>` |
| `components.reana_message_broker.imagePullPolicy` | REANA-Message-Broker image pull policy | IfNotPresent |
Expand Down Expand Up @@ -50,9 +51,13 @@ This Helm automatically prefixes all names using the release name to avoid colli
| `components.reana_workflow_controller.environment.REANA_JOB_HOSTPATH_MOUNTS` | JSON list of optional hostPath mounts, for all user jobs. Each mount object has a key `name` (name of the mount), `hostPath` (path to the directory to be mounted from the Kubernetes nodes) and `mountPath` (path inside the job containers where the `hostPath` will be mounted) | None |
| `components.reana_workflow_controller.environment.REANA_RUNTIME_KUBERNETES_KEEP_ALIVE_JOBS_WITH_STATUSES` | Keep alive Kubernetes user runtime jobs depending on status (`finished` and/or `failed`). | None |
| `components.reana_workflow_controller.environment.REANA_JOB_STATUS_CONSUMER_PREFETCH_COUNT` | Define max number of unacknowledged deliveries that are permitted on `jobs-status` queue consumer. | 10 |
| `components.reana_workflow_engine_cwl.environment` | [REANA-Workflow-Engine-CWL](https://github.com/reanahub/reana-workflow-engine-cwl) environment variables | `{}` |
| `components.reana_workflow_engine_cwl.image` | [REANA-Workflow-Engine-CWL image](https://hub.docker.com/r/reanahub/reana-workflow-engine-cwl) to use | `docker.io/reanahub/reana-workflow-engine-cwl:<chart-release-version>` |
| `components.reana_workflow_engine_serial.environment` | [REANA-Workflow-Engine-Serial](https://github.com/reanahub/reana-workflow-engine-serial) environment variables | `{}` |
| `components.reana_workflow_engine_serial.image` | [REANA-Workflow-Engine-Serial image](https://hub.docker.com/r/reanahub/reana-workflow-engine-serial) to use | `docker.io/reanahub/reana-workflow-engine-serial:<chart-release-version>` |
| `components.reana_workflow_engine_yadage.environment` | [REANA-Workflow-Engine-yadage](https://github.com/reanahub/reana-workflow-engine-yadage) environment variables | `{}` |
| `components.reana_workflow_engine_yadage.image` | [REANA-Workflow-Engine-Yadage image](https://hub.docker.com/r/reanahub/reana-workflow-engine-yadage) to use | `docker.io/reanahub/reana-workflow-engine-yadage:<chart-release-version>` |
| `components.reana_workflow_engine_snakemake.environment` | [REANA-Workflow-Engine-Snakemake](https://github.com/reanahub/reana-workflow-engine-snakemake) environment variables | `{}` |
| `components.reana_workflow_engine_snakemake.image` | [REANA-Workflow-Engine-Snakemake image](https://hub.docker.com/r/reanahub/reana-workflow-engine-snakemake) to use | `docker.io/reanahub/reana-workflow-engine-snakemake:<chart-release-version>` |
| `compute_backends` | List of supported compute backends (kubernetes, htcondorcern, slurmcern) | "kubernetes" |
| `db_env_config.REANA_DB_HOST` | Environment variable to connect to external databases | `<chart-release-name>-db` |
Expand Down
12 changes: 12 additions & 0 deletions helm/reana/templates/reana-workflow-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,18 @@ spec:
value: {{ .Values.components.reana_workflow_engine_serial.image }}
- name: REANA_WORKFLOW_ENGINE_IMAGE_SNAKEMAKE
value: {{ .Values.components.reana_workflow_engine_snakemake.image }}
# Environment variables for workflow engines
- name: REANA_WORKFLOW_ENGINE_CWL_ENV_VARS
value: {{ .Values.components.reana_workflow_engine_cwl.environment | toJson | quote }}
- name: REANA_WORKFLOW_ENGINE_SERIAL_ENV_VARS
value: {{ .Values.components.reana_workflow_engine_serial.environment | toJson | quote }}
- name: REANA_WORKFLOW_ENGINE_SNAKEMAKE_ENV_VARS
value: {{ .Values.components.reana_workflow_engine_snakemake.environment | toJson | quote }}
- name: REANA_WORKFLOW_ENGINE_YADAGE_ENV_VARS
value: {{ .Values.components.reana_workflow_engine_yadage.environment | toJson | quote }}
# Environment variables for job controller
- name: REANA_JOB_CONTROLLER_ENV_VARS
value: {{ .Values.components.reana_job_controller.environment | toJson | quote }}
{{- if .Values.reana_hostname }}
- name: REANA_HOSTNAME
value: {{ .Values.reana_hostname }}
Expand Down
5 changes: 5 additions & 0 deletions helm/reana/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,19 @@ components:
REANA_JOB_STATUS_CONSUMER_PREFETCH_COUNT: 10
reana_workflow_engine_cwl:
image: docker.io/reanahub/reana-workflow-engine-cwl:0.9.2
environment: {}
reana_workflow_engine_yadage:
image: docker.io/reanahub/reana-workflow-engine-yadage:0.9.3
environment: {}
reana_workflow_engine_serial:
image: docker.io/reanahub/reana-workflow-engine-serial:0.9.2
environment: {}
reana_workflow_engine_snakemake:
image: docker.io/reanahub/reana-workflow-engine-snakemake:0.9.2
environment: {}
reana_job_controller:
image: docker.io/reanahub/reana-job-controller:0.9.2
environment: {}
reana_message_broker:
imagePullPolicy: IfNotPresent
image: docker.io/reanahub/reana-message-broker:0.9.2
Expand Down
Loading