Update epics shared services

services/epics-opis/Chart.yaml

@@ -8,6 +8,5 @@ type: application
 
 dependencies:
   - name: epics-opis
-    version: "3.4.0"
-    #repository: "file:///scratch/hgv27681/work/ec-helm-charts/Charts/epics-opis"
+    version: 4.0.0
     repository: "oci://ghcr.io/epics-containers"

services/epics-opis/README.md

@@ -2,15 +2,3 @@ epics-opis Helm Chart
 =====================
 
 Installs the web server that shares the engineering screens published by each IOC. The structure is two deep only: IOC names as folders at the root containing all the IOCs OPI files in a flat list.
-
-Deploy this chart to the cluster by setting up your cluster namespace connection using environment.sh and then executing
-the following commands:
-
-```bash
-# lists the latest versions of all services
-ec list
-# deploy the latest version of the epics-pvcs which includes an opis volume
-ec deploy epics-pvcs VERSION
-# deploy the latest version of the epics-opis service
-ec deploy epics-opis VERSION
-```

services/epics-opis/values.yaml

@@ -1,20 +1,4 @@
-epics-opis:
-  # the beamline name - only set for beamlines
-  beamline: bl45p
-  # the location where the IOCs will run - same as beamline for beamlines
-  ioc_group: bl45p
-  # the name of the repository in which the IOC is grouped
-  location: bl45p
-
-  # 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
-
-  # extra toleration for the shared cluster training rigs
-  tolerations:
-    - key: "nodetype"
-      operator: "Equal"
-      value: "test-rig"
-      effect: "NoSchedule"
+# Short name for this collection of services
+# ioc_group:
+# location where these IOCs and services will run
+# location:

services/epics-pvcs/Chart.yaml

@@ -8,6 +8,5 @@ type: application
 
 dependencies:
   - name: epics-pvcs
-    version: "3.4.0"
-    # repository: "file:///scratch/hgv27681/work/ec-helm-charts/Charts/epics-pvcs"
-    repository: "oci://ghcr.io/epics-containers"
+    version: 4.0.0
+    repository: "oci://ghcr.io/epics-containers"

services/epics-pvcs/README.md

@@ -8,13 +8,3 @@ Sets up the PVCs that all IOCs may use. These should be set up once and not dele
   - autosave data: for IOCs that support autosave. This is separate from IOC helm charts so that it can survive deletion and re-creation of an IOC.
 
   - opis: all the OPI files for engineering screens that an IOC supplies are saved here. This is stored in a single PVC so that the opis service can publish them over http for access by an OPI client.
-
-Deploy this chart to the cluster by setting up your cluster namespace connection using environment.sh and then executing
-the following commands:
-
-```bash
-# lists the latest versions of all services
-ec list
-# deploy the latest version of the epics-pvcs
-ec deploy epics-pvcs VERSION
-```

services/epics-pvcs/values.yaml

@@ -1,8 +1,4 @@
-epics-pvcs:
-
-  # the beamline name - only set for beamlines
-  beamline: bl45p
-  # the location where the IOCs will run - same as beamline for beamlines
-  ioc_group: bl45p
-  # the name of the repository in which the IOC is grouped
-  location: bl45p
+# Short name for this collection of services
+# ioc_group:
+# location where these IOCs and services will run
+# location:

services/values.yaml

@@ -1,25 +1,40 @@
 # shared beamline values for all services
 
 global:
-  beamline: bl45p
-  enabled: true
-  location: bl45p
   ioc_group: p45
+  location: bl45p
+  enabled: true
 
 ioc-instance:
+  # useHostNetwork - use host network for IOC - required for Channel Access
+  # to work outside of the cluster
+  hostNetwork: true
+
+  # affinity and tolerations to get the right nodes on pollux
   securityContext:
     runAsUser: 37988
     runAsGroup: 37988
 
-  dataVolume:
-    pvc: false
-    hostPath: /dls/p45/data
-
-  useAffinity: true
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+          - matchExpressions:
+              - key: beamline
+                operator: In
+                values:
+                  - bl45p
 
-  # extra toleration for bl45p's nodetype taint
   tolerations:
-    - key: "nodetype"
-      operator: "Equal"
-      value: "test-rig"
-      effect: "NoSchedule"
+    - key: beamline
+      operator: Equal
+      value: bl45p
+      effect: NoSchedule
+    - key: location
+      operator: Equal
+      value: bl45p
+      effect: NoSchedule
+    - key: nodetype
+      operator: Equal
+      value: training-rig
+      effect: NoSchedule