From 5f40849c59ecc86470f3d24c91c1f8df87173848 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 8 Oct 2026 10:06:43 +0000 Subject: [PATCH 1/3] chore: change default source for dodal devices to deviceManager --- helm/blueapi/README.md | 4 ++-- helm/blueapi/values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helm/blueapi/README.md b/helm/blueapi/README.md index 8e347d594..d6806fe4d 100644 --- a/helm/blueapi/README.md +++ b/helm/blueapi/README.md @@ -49,9 +49,9 @@ A Helm chart deploying a worker pod that runs Bluesky plans | tracing | object | `{"fastapi":{"excludedURLs":"/healthz"},"otlp":{"enabled":false,"protocol":"http/protobuf","server":{"host":"http://opentelemetry-collector.tracing","port":4318}}}` | Exclude health probe requests from tracing by default to prevent spamming | | volumeMounts | list | `[]` | 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":"/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 | object | `{"api":{"url":"http://0.0.0.0:8000/"},"env":{"sources":[{"kind":"deviceManager","module":"dodal.beamlines.adsim"},{"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.env.sources | list | `[{"kind":"deviceManager","module":"dodal.beamlines.adsim"},{"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":"/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 | diff --git a/helm/blueapi/values.yaml b/helm/blueapi/values.yaml index 941575fb9..0f8dc9fd2 100644 --- a/helm/blueapi/values.yaml +++ b/helm/blueapi/values.yaml @@ -188,8 +188,8 @@ worker: env: # -- modules (must be installed in the venv) to fetch devices/plans from sources: - # - kind: dodal - # module: dodal.beamlines.adsim + - kind: deviceManager + module: dodal.beamlines.adsim - kind: planFunctions module: dodal.plans - kind: planFunctions From c8d30ab0450ce6d0a86978ed81ba14d81a9c5414 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 8 Oct 2026 12:17:17 +0000 Subject: [PATCH 2/3] comment out deviceManager --- helm/blueapi/README.md | 4 ++-- helm/blueapi/values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helm/blueapi/README.md b/helm/blueapi/README.md index d6806fe4d..8e347d594 100644 --- a/helm/blueapi/README.md +++ b/helm/blueapi/README.md @@ -49,9 +49,9 @@ A Helm chart deploying a worker pod that runs Bluesky plans | tracing | object | `{"fastapi":{"excludedURLs":"/healthz"},"otlp":{"enabled":false,"protocol":"http/protobuf","server":{"host":"http://opentelemetry-collector.tracing","port":4318}}}` | Exclude health probe requests from tracing by default to prevent spamming | | volumeMounts | list | `[]` | 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":"deviceManager","module":"dodal.beamlines.adsim"},{"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 | 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":"deviceManager","module":"dodal.beamlines.adsim"},{"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.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":"/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 | diff --git a/helm/blueapi/values.yaml b/helm/blueapi/values.yaml index 0f8dc9fd2..31ed05b74 100644 --- a/helm/blueapi/values.yaml +++ b/helm/blueapi/values.yaml @@ -188,8 +188,8 @@ worker: env: # -- modules (must be installed in the venv) to fetch devices/plans from sources: - - kind: deviceManager - module: dodal.beamlines.adsim + # - kind: deviceManager + # module: dodal.beamlines.adsim - kind: planFunctions module: dodal.plans - kind: planFunctions From 2afade7bfd7798ef0d6a8c000e0fe67840910631 Mon Sep 17 00:00:00 2001 From: Shreelakshmi Iyengar Date: Thu, 8 Oct 2026 16:46:09 +0100 Subject: [PATCH 3/3] Update helm/blueapi/values.yaml Co-authored-by: Zoheb Shaikh --- helm/blueapi/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/blueapi/values.yaml b/helm/blueapi/values.yaml index 31ed05b74..f62ee9b65 100644 --- a/helm/blueapi/values.yaml +++ b/helm/blueapi/values.yaml @@ -189,7 +189,7 @@ worker: # -- modules (must be installed in the venv) to fetch devices/plans from sources: # - kind: deviceManager - # module: dodal.beamlines.adsim + # module: dodal.beamlines.adsim - kind: planFunctions module: dodal.plans - kind: planFunctions