Skip to content

Commit

Permalink
workflow_run_manager: do not mount db directory in job-controller
Browse files Browse the repository at this point in the history
  • Loading branch information
mdonadoni committed Jan 17, 2023
1 parent b32bf51 commit 6bdd570
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Version 0.9.0 (UNRELEASED)
- Changes the workflow set status endpoint to remove the workspace by default when a workflow is deleted and to fail if the request is asking not to delete the workspace.
- Changes to PostgreSQL 12.13.
- Changes the `move_files` endpoint to allow moving files while a workflow is running.
- Changes the deployment of job-controller to avoid unnecessarily mounting the database's directory.
- Fixes the workflow list endpoint to correctly parse the boolean parameters ``include_progress``, ``include_workspace_size`` and ``include_retention_rules``.

Version 0.8.2 (2022-10-06)
Expand Down
9 changes: 3 additions & 6 deletions reana_workflow_controller/workflow_run_manager.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file is part of REANA.
# Copyright (C) 2019, 2020, 2021, 2022 CERN.
# Copyright (C) 2019, 2020, 2021, 2022, 2023 CERN.
#
# REANA is free software; you can redistribute it and/or modify it
# under the terms of the MIT License; see LICENSE file for more details.
Expand Down Expand Up @@ -36,7 +36,7 @@
from reana_commons.k8s.api_client import current_k8s_batchv1_api_client
from reana_commons.k8s.kerberos import get_kerberos_k8s_config
from reana_commons.k8s.secrets import REANAUserSecretsStore
from reana_commons.k8s.volumes import get_shared_volume, get_workspace_volume
from reana_commons.k8s.volumes import get_workspace_volume
from reana_commons.utils import (
build_unique_component_name,
create_cvmfs_persistent_volume_claim,
Expand Down Expand Up @@ -451,7 +451,6 @@ def _create_job_spec(
workspace_mount, workspace_volume = get_workspace_volume(
self.workflow.workspace_path
)
db_mount, shared_volume = get_shared_volume("db")

workflow_metadata = client.V1ObjectMeta(
name=name,
Expand Down Expand Up @@ -604,8 +603,7 @@ def _create_job_spec(
)

secrets_volume_mount = secrets_store.get_secrets_volume_mount_as_k8s_spec()
job_controller_container.volume_mounts = [workspace_mount, db_mount]
job_controller_container.volume_mounts.append(secrets_volume_mount)
job_controller_container.volume_mounts = [workspace_mount, secrets_volume_mount]

job_controller_container.ports = [
{"containerPort": current_app.config["JOB_CONTROLLER_CONTAINER_PORT"]}
Expand All @@ -621,7 +619,6 @@ def _create_job_spec(
)
volumes = [
workspace_volume,
shared_volume,
secrets_store.get_file_secrets_volume_as_k8s_specs(),
]

Expand Down

0 comments on commit 6bdd570

Please sign in to comment.