From 55f6f3a0eef41bb751f9320e720c59fdeaead31b Mon Sep 17 00:00:00 2001 From: Giles Knap Date: Tue, 26 Mar 2024 12:45:37 +0000 Subject: [PATCH] update to fixed aravis image --- helm/shared/values.yaml | 12 ++++-------- services/bl47p-ea-dcam-01/config/ioc.yaml | 2 +- services/bl47p-ea-dcam-01/values.yaml | 2 +- services/bl47p-ea-dcam-02/config/ioc.yaml | 2 +- services/bl47p-ea-dcam-02/values.yaml | 2 +- services/bl47p-mo-ioc-01/config/ioc.yaml | 2 +- 6 files changed, 9 insertions(+), 13 deletions(-) diff --git a/helm/shared/values.yaml b/helm/shared/values.yaml index 69012c9..5096e15 100644 --- a/helm/shared/values.yaml +++ b/helm/shared/values.yaml @@ -1,6 +1,5 @@ # default values for all IOCs on bl47p beamline ioc-instance: - # the beamline name - only set for beamlines beamline: bl47p # the location where the IOCs will run - same as beamline for beamlines @@ -19,9 +18,8 @@ ioc-instance: # useAffinity - only run on nodes with label beamline: # or location: # Comment out useAffiniity for dedicated cluster, set to true for shared cluster - + useAffinity: true - # root folder for ioc source/binaries inside generic IOC container iocFolder: /epics/ioc @@ -31,7 +29,6 @@ ioc-instance: stop: /epics/ioc/stop.sh liveness: /epics/ioc/liveness.sh - # The following are added to the pod's environment and are shared by all # IOCs. TODO - these defaults are for a lab crate in DLS - if you have # RTEMS IOCs update accordingly. @@ -54,9 +51,9 @@ ioc-instance: # This also adds environment variables to the pod, but this should be # overridden by each IOC's values.yaml as needed. Don't set values in this # file because they will be overridden by IOCs. - iocEnv: - - name: "" - value: "" + # iocEnv: + # - name: "" + # value: "" # defaults for securityContext # Usually override runAsXXX in the individual IOC values.yaml. @@ -111,4 +108,3 @@ ioc-instance: operator: "Equal" value: "training-rig" effect: "NoSchedule" - diff --git a/services/bl47p-ea-dcam-01/config/ioc.yaml b/services/bl47p-ea-dcam-01/config/ioc.yaml index 45c0875..2827bf5 100644 --- a/services/bl47p-ea-dcam-01/config/ioc.yaml +++ b/services/bl47p-ea-dcam-01/config/ioc.yaml @@ -1,4 +1,4 @@ -# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adaravis/releases/download/2024.1.2/ibek.ioc.schema.json +# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adaravis/releases/download/2024.4.2b1/ibek.ioc.schema.json ioc_name: "{{ __utils__.get_env('IOC_NAME') }}" diff --git a/services/bl47p-ea-dcam-01/values.yaml b/services/bl47p-ea-dcam-01/values.yaml index c370b32..31a805b 100644 --- a/services/bl47p-ea-dcam-01/values.yaml +++ b/services/bl47p-ea-dcam-01/values.yaml @@ -1,4 +1,4 @@ # latest container image for GigE cameras from the GitHub Container Registry shared: ioc-instance: - image: ghcr.io/epics-containers/ioc-adaravis-runtime:2024.4.1 + image: ghcr.io/epics-containers/ioc-adaravis-runtime:2024.4.2b1 diff --git a/services/bl47p-ea-dcam-02/config/ioc.yaml b/services/bl47p-ea-dcam-02/config/ioc.yaml index 8389481..e7e8c7e 100644 --- a/services/bl47p-ea-dcam-02/config/ioc.yaml +++ b/services/bl47p-ea-dcam-02/config/ioc.yaml @@ -1,4 +1,4 @@ -# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adaravis/releases/download/2024.1.2/ibek.ioc.schema.json +# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adaravis/releases/download/2024.4.2b1/ibek.ioc.schema.json ioc_name: "{{ __utils__.get_env('IOC_NAME') }}" diff --git a/services/bl47p-ea-dcam-02/values.yaml b/services/bl47p-ea-dcam-02/values.yaml index c370b32..31a805b 100644 --- a/services/bl47p-ea-dcam-02/values.yaml +++ b/services/bl47p-ea-dcam-02/values.yaml @@ -1,4 +1,4 @@ # latest container image for GigE cameras from the GitHub Container Registry shared: ioc-instance: - image: ghcr.io/epics-containers/ioc-adaravis-runtime:2024.4.1 + image: ghcr.io/epics-containers/ioc-adaravis-runtime:2024.4.2b1 diff --git a/services/bl47p-mo-ioc-01/config/ioc.yaml b/services/bl47p-mo-ioc-01/config/ioc.yaml index edca5f6..b475702 100644 --- a/services/bl47p-mo-ioc-01/config/ioc.yaml +++ b/services/bl47p-mo-ioc-01/config/ioc.yaml @@ -1,4 +1,4 @@ -# yaml-language-server: $schema=https://github.com/epics-containers/ioc-pmac/releases/download/2024.1.2/ibek.ioc.schema.json +# yaml-language-server: $schema=https://github.com/epics-containers/ioc-pmac/releases/download/2024.4.1/ibek.ioc.schema.json ioc_name: "{{ __utils__.get_env('IOC_NAME') }}" description: auto-generated by https://github.com/epics-containers/builder2ibek