new structure for dcams

epics-containers · Jul 13, 2024 · d164a46 · d164a46
1 parent e1c9601
commit d164a46
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 50 deletions.
diff --git a/.template/config/ioc.yaml b/.template/config/ioc.yaml
diff --git a/.template/values.yaml b/.template/values.yaml
diff --git a/services/.template/Chart.yaml b/services/.template/Chart.yaml
@@ -8,6 +8,6 @@ type: application
 
 dependencies:
   - name: ioc-instance
-    version: 3.6.0
-    #repository: "oci://ghcr.io/epics-containers"
-    repository: "file:///home/giles/work/ec-helm-charts/Charts/ioc-instance"
+    version: 4.0.0
+    repository: "oci://ghcr.io/epics-containers"
+    #repository: "file:///home/giles/work/ec-helm-charts/Charts/ioc-instance"
diff --git a/services/bl45p-ea-dcam-01/Chart.yaml b/services/bl45p-ea-dcam-01/Chart.yaml
@@ -0,0 +1,15 @@
+# A Helm Chart for an IOC instance
+apiVersion: v2
+name: ec-service
+
+version: 1.0.0
+
+type: application
+
+dependencies:
+  - name: ioc-instance
+    version: 4.0.0
+    repository: "oci://ghcr.io/epics-containers"
+  - name: dls-aravis
+    version: 1.0.0
+    repository: "file://../dls-aravis"
diff --git a/services/bl45p-ea-dcam-01/values.yaml b/services/bl45p-ea-dcam-01/values.yaml
@@ -0,0 +1,10 @@
+# Arguments to the shared ioc instance template dls-aravis
+# This will make an IOC instance for an aravis camera with a standard set
+# of Areadetector plugins.
+
+dls-aravis:
+  P: BL45P-EA-MAP-01
+  ID: bl45p-ea-detector-01
+
+ioc-instance:
+  image: ghcr.io/epics-containers/ioc-adaravis-runtime:2024.7.1
diff --git a/.template/Chart.yaml → services/bl45p-ea-dcam-02/Chart.yaml b/.template/Chart.yaml → services/bl45p-ea-dcam-02/Chart.yaml
@@ -10,5 +10,7 @@ dependencies:
   - name: ioc-instance
     version: 4.0.0
     #repository: "oci://ghcr.io/epics-containers"
-    # version 1.0.0
-    # repository: "file:///home/giles/work/ec-helm-charts/Charts/ioc-instance"
+    repository: "oci://ghcr.io/epics-containers"
+  - name: dls-aravis
+    version: 1.0.0
+    repository: "file://../dls-aravis"
diff --git a/services/bl45p-ea-dcam-02/values.yaml b/services/bl45p-ea-dcam-02/values.yaml
@@ -0,0 +1,10 @@
+# Arguments to the shared ioc instance template dls-aravis
+# This will make an IOC instance for an aravis camera with a standard set
+# of Areadetector plugins.
+
+dls-aravis:
+  P: BL45P-EA-DIFF-01
+  ID: bl45p-ea-detector-02
+
+ioc-instance:
+  image: ghcr.io/epics-containers/ioc-adaravis-runtime:2024.7.1
diff --git a/services/bl45p-mo-brick-01/Chart.yaml b/services/bl45p-mo-brick-01/Chart.yaml
@@ -10,4 +10,3 @@ dependencies:
   - name: ioc-instance
     version: 4.0.0
     repository: "oci://ghcr.io/epics-containers"
-    # repository: "file:///home/giles/work/ec-helm-charts/Charts/ioc-instance"
diff --git a/services/bl45p-mo-panda-01/Chart.yaml b/services/bl45p-mo-panda-01/Chart.yaml
@@ -10,4 +10,3 @@ dependencies:
   - name: ioc-instance
     version: 4.0.0
     repository: "oci://ghcr.io/epics-containers"
-    # repository: "file:///home/giles/work/ec-helm-charts/Charts/ioc-instance"
diff --git a/services/bl45p-mo-panda-02/Chart.yaml b/services/bl45p-mo-panda-02/Chart.yaml
@@ -10,4 +10,3 @@ dependencies:
   - name: ioc-instance
     version: 4.0.0
     repository: "oci://ghcr.io/epics-containers"
-    # repository: "file:///home/giles/work/ec-helm-charts/Charts/ioc-instance"
diff --git a/services/dls-aravis/Chart.yaml b/services/dls-aravis/Chart.yaml
@@ -5,10 +5,3 @@ name: ec-service
 version: 1.0.0
 
 type: application
-
-dependencies:
-  - name: ioc-instance
-    version: 4.0.0
-    repository: "oci://ghcr.io/epics-containers"
-    #version: 1.0.0
-    #repository: "file:///home/giles/work/ec-helm-charts/Charts/ioc-instance"
diff --git a/services/dls-aravis/values.yaml b/services/dls-aravis/values.yaml
@@ -1,10 +1,11 @@
-# yaml-language-server: $schema=https://github.com/marcelldls/ec-helm-charts/releases/download/3.4.4/ioc-instance.schema.json#/$defs/service
+# This chart creates a configmap for a Diagnostics GigE camera with AD plugins.
 
-# This parent chart creates an Diagnostics GigE camera with AD plugins
-# The following values may be supplied, the first two are mandatory
+# IMPORTANT: It's only purpose is to create a configmap with the necessary
+# EPICS manifest ioc.yaml.
+# It must be used as a peer to the ioc-instance chart that uses
+# the configmap and makes the rest of the IOC resources in the cluster.
 
-# TODO - this chart could easily also allow for configuring the count of
-# each type of plugin you would like. Currently there is a fixed set of plugins.
+# The following values may be supplied, the first two are mandatory
 
 # PV Prefix
 P:
@@ -14,9 +15,3 @@ ID:
 
 # The type of camera - leave this value as AutoADGenICam for automatic discovery
 CLASS: AutoADGenICam
-
-# Child chart ioc-instance configures K8S manifisets for this IOC
-# NOTE: the values for ioc-instance will be combined with beamline_values.yaml
-# when this is being deployed from a beamline repo by ArgoCD
-ioc-instance:
-  image: ghcr.io/epics-containers/ioc-adaravis-runtime:2024.7.1