switch to library

Charts/beamline-chart/Chart.yaml

@@ -1,6 +1,7 @@
 # A Helm Chart for an IOC instance
 apiVersion: v2
-name: ioc-instance-beamline
+name: ioc-instance
 
-# this is replaced by command line arguments when `ec` invokes helm
 version: 1.0.0
+
+type: library

Charts/beamline-chart/templates/_configmap.yaml

@@ -0,0 +1,14 @@
+{{- define "ioc-instance.configmap" -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name:  {{ .Values.ioc_name }}
+  labels:
+    app: {{ .Values.ioc_name }}
+    beamline: {{ .Values.beamline }}
+    ioc_version: {{ .Values.ioc_version | quote }}
+    is_ioc: "True"
+data:
+
+{{- end -}}

Charts/beamline-chart/templates/deployment.yaml → Charts/beamline-chart/templates/_deployment.yaml

@@ -1,3 +1,5 @@
+{{- define "ioc-instance.deployment" -}}
+
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -138,3 +140,6 @@ spec:
           operator: Equal
           value: {{ .Values.beamline }}
           effect: NoSchedule
+
+---
+{{- end -}}

Charts/beamline-chart/templates/ioc-volume.yaml → Charts/beamline-chart/templates/_ioc-volume.yaml

@@ -1,4 +1,6 @@
 # IOCS can use a PVC as a data volume, or mount the host filesystem
+{{- define "ioc-instance.volume" -}}
+
 {{- if .Values.dataVolume.pvc }}
 ---
 kind: PersistentVolumeClaim
@@ -14,4 +16,9 @@ spec:
   resources:
     requests:
       storage: 1000Mi
+
+---
+{{- end }}
+
 {{- end }}
+

Charts/beamline-chart/templates/_ioc.yaml

@@ -0,0 +1,5 @@
+{{- define "ioc-instance.ioc" }}
+{{  include "ioc-instance.volume" . }}
+{{  include "ioc-instance.deployment" . }}
+{{  include "ioc-instance.configmap" . }}
+{{ end }}