feat: Change Default Scratch Root to /workspace

helm/blueapi/README.md

@@ -47,9 +47,9 @@ A Helm chart deploying a worker pod that runs Bluesky plans
 | tracing | object | `{"otlp":{"enabled":false,"protocol":"http/protobuf","server":{"host":"http://opentelemetry-collector.tracing","port":4318}}}` | Configure tracing: opentelemetry-collector.tracing should be available in all Diamond clusters |
 | volumeMounts | list | `[{"mountPath":"/config","name":"worker-config","readOnly":true}]` | Additional volumeMounts on the output StatefulSet definition. Define how volumes are mounted to the container referenced by using the same name. |
 | volumes | list | `[]` | Additional volumes on the output StatefulSet definition. Define volumes from e.g. Secrets, ConfigMaps or the Filesystem |
-| worker | object | `{"api":{"url":"http://0.0.0.0:8000/"},"env":{"sources":[{"kind":"planFunctions","module":"dodal.plans"},{"kind":"planFunctions","module":"dodal.plan_stubs.wrapped"}]},"logging":{"graylog":{"enabled":false,"url":"tcp://graylog-log-target.diamond.ac.uk:12231/"},"level":"INFO"},"scratch":{"repositories":[],"root":"/blueapi-plugins/scratch"},"stomp":{"auth":{"password":"guest","username":"guest"},"enabled":false,"url":"tcp://rabbitmq:61613/"}}` | Config for the worker goes here, will be mounted into a config file |
+| worker | object | `{"api":{"url":"http://0.0.0.0:8000/"},"env":{"sources":[{"kind":"planFunctions","module":"dodal.plans"},{"kind":"planFunctions","module":"dodal.plan_stubs.wrapped"}]},"logging":{"graylog":{"enabled":false,"url":"tcp://graylog-log-target.diamond.ac.uk:12231/"},"level":"INFO"},"scratch":{"repositories":[],"root":"/workspace"},"stomp":{"auth":{"password":"guest","username":"guest"},"enabled":false,"url":"tcp://rabbitmq:61613/"}}` | Config for the worker goes here, will be mounted into a config file |
 | worker.api.url | string | `"http://0.0.0.0:8000/"` | 0.0.0.0 required to allow non-loopback traffic If using hostNetwork, the port must be free on the host |
 | worker.env.sources | list | `[{"kind":"planFunctions","module":"dodal.plans"},{"kind":"planFunctions","module":"dodal.plan_stubs.wrapped"}]` | modules (must be installed in the venv) to fetch devices/plans from |
 | worker.logging | object | `{"graylog":{"enabled":false,"url":"tcp://graylog-log-target.diamond.ac.uk:12231/"},"level":"INFO"}` | Configures logging. Port 12231 is the `dodal` input on graylog which will be renamed `blueapi` |
-| worker.scratch | object | `{"repositories":[],"root":"/blueapi-plugins/scratch"}` | If initContainer is enabled the default branch of python projects in this section are installed into the venv *without their dependencies* |
+| worker.scratch | object | `{"repositories":[],"root":"/workspace"}` | If initContainer is enabled the default branch of python projects in this section are installed into the venv *without their dependencies* |
 | worker.stomp | object | `{"auth":{"password":"guest","username":"guest"},"enabled":false,"url":"tcp://rabbitmq:61613/"}` | Message bus configuration for returning status to GDA/forwarding documents downstream Password may be in the form ${ENV_VAR} to be fetched from an environment variable e.g. mounted from a SealedSecret |

helm/blueapi/values.yaml

@@ -198,7 +198,7 @@ worker:
   # -- If initContainer is enabled the default branch of python projects in this section are installed
   # into the venv *without their dependencies*
   scratch:
-    root: /blueapi-plugins/scratch
+    root: /workspace
     repositories: []
     # - name: "dodal"
     #   remote_url: https://github.com/DiamondLightSource/dodal.git

tests/unit_tests/test_helm_chart.py

@@ -110,7 +110,7 @@ def test_helm_chart_creates_config_map(worker_config: ApplicationConfig):
             "worker": {
                 "scratch": {
                     "repositories": [],
-                    "root": "/blueapi-plugins/scratch",
+                    "root": "/workspace",
                 }
             },
         },
@@ -151,7 +151,7 @@ def test_init_container_spec_generated():
             "worker": {
                 "scratch": {
                     "repositories": [],
-                    "root": "/blueapi-plugins/scratch",
+                    "root": "/workspace",
                 },
             },
             "initContainer": {
@@ -432,15 +432,15 @@ def render_persistent_volume_chart(
 def scratch_volume_mount():
     return {
         "name": "scratch",
-        "mountPath": "/blueapi-plugins/scratch",
+        "mountPath": "/workspace",
     }
 
 
 @pytest.fixture
 def scratch_host_volume_mount():
     return {
         "name": "scratch-host",
-        "mountPath": "/blueapi-plugins/scratch",
+        "mountPath": "/workspace",
         "mountPropagation": "HostToContainer",
     }