mostly workin sub sub chart approach

helm/ioc-instance/Chart.yaml → helm/beamline/Chart.yaml

@@ -1,6 +1,6 @@
 # A Helm Chart for deploying an IOC instance
 apiVersion: v2
-name: ioc-instance-values
+name: beamline
 
 version: 1.0.0
 

helm/configmap/Chart.yaml

@@ -2,6 +2,6 @@
 apiVersion: v2
 name: configmap
 
-version: 1.0.0
+version: 1.0.1
 
 type: application

helm/configmap/templates/configmap.yaml

@@ -1,15 +1,14 @@
----
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name:  {{ .Release.name }}-config
+  name:  {{ .Release.Name }}-config
   labels:
-    app: {{ .Values.ioc_name }}
+    app: {{ .Release.Name }}
 data:
 
 {{- /*
   add the contents of every file in the config folder of this IOC helm chart
   into the config map - The files must be text only.
 */ -}}
 
-{{ (.Files.Glob "../../config/*").AsConfig | indent 2 }}
+{{ (.Files.Glob "../../*").AsConfig | indent 2 }}

services/bl47p-ea-test-01/Chart.yaml

@@ -8,9 +8,9 @@ version: 1.4.1
 type: application
 
 dependencies:
-  - name: ioc-instance-values
-    version: "1.0.0"
-    repository: file://helm/ioc-instance
   - name: configmap
-    version: "1.0.0"
+    version: "1.0.1"
     repository: file://helm/configmap
+  - name: beamline
+    version: "1.0.0"
+    repository: file://helm/beamline

services/bl47p-ea-test-01/config/bl47p-ea-test-01.yaml → services/bl47p-ea-test-01/config/ioc.yaml

@@ -1,5 +1,5 @@
 # yaml-language-server: $schema=https://github.com/epics-containers/ioc-adsimdetector/releases/download/2024.1.2/ibek.ioc.schema.json
-ioc_name: "{{ ioc_yaml_file_name }}"
+ioc_name: "{{ env.ioc_name }}"
 
 description: Example simulated camera for BL47P
 

services/bl47p-ea-test-01/helm

@@ -1 +1 @@
-../../helm
+../../helm/

services/bl47p-ea-test-01/values.yaml

@@ -1 +1,5 @@
-image: ghcr.io/epics-containers/ioc-adsimdetector-linux-runtime:2024.1.2
+# global:
+#   ioc_name: bl47p-ea-test-01
+
+ioc-instance:
+  image: ghcr.io/epics-containers/ioc-adsimdetector-linux-runtime:2024.1.2