Skip to content

Commit

Permalink
update to fixed aravis image
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Mar 26, 2024
1 parent 4cfa2ab commit 55f6f3a
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 13 deletions.
12 changes: 4 additions & 8 deletions helm/shared/values.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -19,9 +18,8 @@ ioc-instance:
# useAffinity - only run on nodes with label beamline:<beamline-name>
# or location:<location-name>
# 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
Expand All @@ -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.
Expand All @@ -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.
Expand Down Expand Up @@ -111,4 +108,3 @@ ioc-instance:
operator: "Equal"
value: "training-rig"
effect: "NoSchedule"

2 changes: 1 addition & 1 deletion services/bl47p-ea-dcam-01/config/ioc.yaml
Original file line number Diff line number Diff line change
@@ -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') }}"

Expand Down
2 changes: 1 addition & 1 deletion services/bl47p-ea-dcam-01/values.yaml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion services/bl47p-ea-dcam-02/config/ioc.yaml
Original file line number Diff line number Diff line change
@@ -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') }}"

Expand Down
2 changes: 1 addition & 1 deletion services/bl47p-ea-dcam-02/values.yaml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion services/bl47p-mo-ioc-01/config/ioc.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 55f6f3a

Please sign in to comment.