diff --git a/.copier-answers.yml b/.copier-answers.yml index eb7b937..517a847 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: 3.2.1 +_commit: 3.4.0 _src_path: gh:epics-containers/ec-services-template beamline: bl45p cluster_name: pollux diff --git a/helm/shared/Chart.yaml b/helm/shared/Chart.yaml index b9eb0e9..b1b5461 100644 --- a/helm/shared/Chart.yaml +++ b/helm/shared/Chart.yaml @@ -2,12 +2,12 @@ apiVersion: v2 name: shared -version: 3.0.0 +version: 3.4.0 type: application dependencies: - name: ioc-instance - version: "3.0.0" + version: "3.4.0" repository: "oci://ghcr.io/epics-containers" #repository: "file:///scratch/hgv27681/work/ec-helm-charts/Charts/ioc-instance" diff --git a/helm/shared/values.yaml b/helm/shared/values.yaml index 98acdd1..709c80e 100644 --- a/helm/shared/values.yaml +++ b/helm/shared/values.yaml @@ -1,4 +1,4 @@ -# default values for all IOCs on bl47p beamline +# default values for all IOCs on bl45p ioc-instance: # the beamline name - only set for beamlines @@ -31,11 +31,32 @@ ioc-instance: stop: /epics/ioc/stop.sh liveness: /epics/ioc/liveness.sh - # The following are added to the pod's environment - # Add any environment variables as needed - globalenv: - - name: "EXAMPLE_ENV" - value: "example" + + # 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. + globalEnv: + # These variables are used by RTEMS IOCs to find the NFS and TFTP servers + - name: "RTEMS_ROOT_NFS" + value: "/nfsv2-tftp" + - name: "RTEMS_ROOT_TFTP" + value: "/nfsv2-tftp" + - name: "RTEMS_NFS_IP" + value: "172.23.90.238" + - name: "RTEMS_TFTP_IP" + value: "172.23.90.238" + # NB. Gateway and Netmask are the same for all RTEMS IOCs on a beamline + # But may need to move these to iocEnv for Machine IOCs? + - name: "RTEMS_IOC_NETMASK" + value: "255.255.240.0" + - name: "RTEMS_IOC_GATEWAY" + value: "172.23.240.254" + # 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: "" # defaults for securityContext # Usually override runAsXXX in the individual IOC values.yaml. diff --git a/include/iocs/Chart.yaml b/include/iocs/Chart.yaml index fd9a147..9110ace 100644 --- a/include/iocs/Chart.yaml +++ b/include/iocs/Chart.yaml @@ -6,7 +6,7 @@ name: ioc-instance # via a symlink. When changes are made to the dependent charts, it is # necessary to update the version number here so that all IOC instances # show a change in the next commit. -version: 3.0.0 +version: 3.4.0 # When we deploy with the edge-containers-cli we override this on the command line. # Direct deployment with Helm will use the default beta value.This value should @@ -17,5 +17,5 @@ type: application dependencies: - name: shared - version: "3.0.0" + version: "3.4.0" repository: file://../../helm/shared diff --git a/services/bl45p-ea-test-01/values.yaml b/services/bl45p-ea-test-01/values.yaml new file mode 100644 index 0000000..7fd8328 --- /dev/null +++ b/services/bl45p-ea-test-01/values.yaml @@ -0,0 +1,4 @@ +# latest container image for GigE cameras from the GitHub Container Registry +shared: + ioc-instance: + image: ghcr.io/epics-containers/ioc-adsimdetector-runtime:2024.4.1 diff --git a/services/epics-opis/Chart.yaml b/services/epics-opis/Chart.yaml index 2537fa4..e92ddc5 100644 --- a/services/epics-opis/Chart.yaml +++ b/services/epics-opis/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: epics-opis -version: 3.0.2 +version: 3.4.0 # When we deploy with the edge-containers-cli we override this on the command line. # Direct deployment with Helm will use the default beta value. @@ -12,6 +12,6 @@ type: application dependencies: - name: epics-opis - version: "3.0.2" + version: "3.4.0" #repository: "file:///scratch/hgv27681/work/ec-helm-charts/Charts/epics-opis" repository: "oci://ghcr.io/epics-containers" diff --git a/services/epics-pvcs/Chart.yaml b/services/epics-pvcs/Chart.yaml index dfab981..06ba1c7 100644 --- a/services/epics-pvcs/Chart.yaml +++ b/services/epics-pvcs/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: epics-pvcs -version: 3.0.0 +version: 3.4.0 # When we deploy with the edge-containers-cli we override this on the command line. # Direct deployment with Helm will use the default beta value. @@ -12,6 +12,6 @@ type: application dependencies: - name: epics-pvcs - version: "3.0.0" + version: "3.4.0" # repository: "file:///scratch/hgv27681/work/ec-helm-charts/Charts/epics-pvcs" repository: "oci://ghcr.io/epics-containers"