restructure for nested helm charts

epics-containers · Jan 30, 2024 · dcb5fbc · dcb5fbc
1 parent bb8ca6d
commit dcb5fbc
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 33 deletions.
diff --git a/services/_ioc_helm/Chart.yaml → services/_helm/configmap/Chart.yaml b/services/_ioc_helm/Chart.yaml → services/_helm/configmap/Chart.yaml
@@ -1,6 +1,6 @@
 # A Helm Chart for adding arbitrary configuration to a service instance
 apiVersion: v2
-name: instance-config
+name: configmap
 
 version: 1.0.0
 

diff --git a/services/_helm/configmap/templates/configmap.yaml b/services/_helm/configmap/templates/configmap.yaml
@@ -0,0 +1,19 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name:  {{ .Release.name }}-config
+  labels:
+    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.
+
+  Also add a version.txt file that contains the version of the IOC
+*/ -}}
+
+{{ (.Files.Glob "../../config/*").AsConfig | indent 2 }}
+  version.txt: |
+    "IOC {{ .Release.Name }} version {{ .Release.Version }}""
diff --git a/services/_helm/ioc-instance/Chart.yaml b/services/_helm/ioc-instance/Chart.yaml
@@ -0,0 +1,13 @@
+# A Helm Chart for deploying an IOC instance
+apiVersion: v2
+name: ioc-instance-values
+
+version: 1.0.0
+
+type: application
+
+dependencies:
+  - name: ioc-instance
+    version: "1.4.1"
+    # repository: "oci://ghcr.io/epics-containers"
+    repository: "file:///scratch/hgv27681/work/ec-helm-charts/Charts/ioc-instance"
diff --git a/services/_ioc_helm/README.md → services/_helm/ioc-instance/README.md b/services/_ioc_helm/README.md → services/_helm/ioc-instance/README.md
diff --git a/services/_ioc_helm/values.yaml → services/_helm/ioc-instance/values.yaml b/services/_ioc_helm/values.yaml → services/_helm/ioc-instance/values.yaml
@@ -1,5 +1,4 @@
-# default values for all IOCs on bl38p
-# see end of file for values that may be overridden per individual IOC
+# default values for all IOCs on bl47p beamline
 
 beamline: bl47p
 # we use the default service account in the namespace so leave this out

diff --git a/services/_ioc_helm/templates/configmap.yaml b/services/_ioc_helm/templates/configmap.yaml
diff --git a/services/bl47p-ea-test-01/Chart.yaml b/services/bl47p-ea-test-01/Chart.yaml
@@ -8,10 +8,11 @@ version: 1.4.1
 type: application
 
 dependencies:
-  - name: ioc-instance
-    version: "1.4.1"
-    # repository: "oci://ghcr.io/epics-containers"
-    repository: "file:///scratch/hgv27681/work/ec-helm-charts/Charts/ioc-instance"
-  - name: ioc-instance-config
+  - name: ioc-instance-values
     version: "1.0.0"
-    repository: file://_ioc_helm
+    repository: file://helm/ioc-instance
+  # - name: configmap
+  #   version: "1.0.0"
+  #   repository: file://helm/configmap
+  #   import-values:
+  #     - Release.Name
diff --git a/services/bl47p-ea-test-01/_ioc_helm b/services/bl47p-ea-test-01/_ioc_helm
diff --git a/services/bl47p-ea-test-01/helm b/services/bl47p-ea-test-01/helm
@@ -0,0 +1 @@
+../_helm