ea-test-01 rendering

epics-containers · Jan 31, 2024 · 4e56e6c · 4e56e6c
1 parent 0d2c189
commit 4e56e6c
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 17 deletions.
diff --git a/helm/configmap/Chart.yaml b/helm/configmap/Chart.yaml
@@ -2,6 +2,6 @@
 apiVersion: v2
 name: configmap
 
-version: 1.0.1
+version: 1.0.0
 
 type: application
diff --git a/helm/configmap/config/world1 b/helm/configmap/config/world1
@@ -0,0 +1 @@
+hello
diff --git a/helm/configmap/config/world2 b/helm/configmap/config/world2
@@ -0,0 +1 @@
+hello
diff --git a/helm/configmap/services b/helm/configmap/services
@@ -0,0 +1 @@
+../../services/
diff --git a/helm/configmap/templates/configmap.yaml b/helm/configmap/templates/configmap.yaml
@@ -6,9 +6,5 @@ metadata:
     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 "../../*").AsConfig | indent 2 }}
+# ---- contents of the ioc instance config folder ----------------------------
+{{ (.Files.Glob "services/bl47p-ea-test-01/config/**").AsConfig | indent 2 }}
diff --git a/services/bl47p-ea-test-01/Chart.yaml b/services/bl47p-ea-test-01/Chart.yaml
@@ -9,8 +9,8 @@ type: application
 
 dependencies:
   - name: configmap
-    version: "1.0.1"
-    repository: file://helm/configmap
+    version: "1.0.0"
+    repository: file://../../helm/configmap
   - name: beamline
     version: "1.0.0"
-    repository: file://helm/beamline
+    repository: file://../../helm/beamline
diff --git a/services/bl47p-ea-test-01/config/ioc.yaml b/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: "{{ env.ioc_name }}"
+ioc_name: "I HAVE NO NAME"
 
 description: Example simulated camera for BL47P
 

diff --git a/services/bl47p-ea-test-01/helm b/services/bl47p-ea-test-01/helm
diff --git a/services/bl47p-ea-test-01/values.yaml b/services/bl47p-ea-test-01/values.yaml
@@ -1,5 +1,3 @@
-# global:
-#   ioc_name: bl47p-ea-test-01
-
-ioc-instance:
-  image: ghcr.io/epics-containers/ioc-adsimdetector-linux-runtime:2024.1.2
+beamline:
+  ioc-instance:
+    image: ghcr.io/epics-containers/ioc-adsimdetector-linux-runtime:2024.1.2