Merge pull request #5 from epics-containers/dev

Improvements to RTEMS support
epics-containers · Mar 16, 2023 · d3afcbd · d3afcbd
2 parents 6c9f3b6 + edd4632
commit d3afcbd
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/templates/_deployment.yaml b/templates/_deployment.yaml
@@ -29,7 +29,12 @@ spec:
       hostNetwork: {{ .Values.hostNetwork }}
       terminationGracePeriodSeconds: 5 # nice to have quick restarts on IOCs
       volumes:
-        {{if .Values.autosave }}
+        {{- if .Values.nfsv2TftpClaim }}
+        - name: nfsv2-tftp-volume
+          persistentVolumeClaim:
+            claimName: {{ .Values.nfsv2TftpClaim }}
+        {{- end }}
+        {{- if .Values.autosave }}
         - name: {{ .Chart.Name }}
           persistentVolumeClaim:
             claimName: {{ .Chart.Name }}
@@ -57,7 +62,7 @@ spec:
         volumeMounts:
         - name: config-volume
           mountPath: {{ .Values.iocFolder }}/config
-        {{if .Values.autosave }}
+        {{- if .Values.autosave }}
         - name: {{ .Chart.Name }}
           mountPath: /autosave
         {{- end }}
@@ -68,11 +73,16 @@ spec:
           mountPropagation: HostToContainer
           {{- end}}
         {{- end }}
+        {{- if .Values.nfsv2TftpClaim }}
+        - name: nfsv2-tftp-volume
+          mountPath: /nfsv2-tftp
+          subPath: "{{ .Values.beamline }}/{{ .Chart.Name }}"
+          {{- end }}
         stdin: true
         tty: true
         securityContext:
 {{  toYaml .Values.securityContext | indent 10}}
-        resources: 
+        resources:
 {{  toYaml .Values.resources | indent 10}}
         imagePullPolicy: Always
         env:
@@ -82,6 +92,14 @@ spec:
           value: {{ .Chart.Name }}
         - name: IOC_VERSION
           value: {{ .Chart.AppVersion | quote }}
+        {{- range $envVar := .Values.env }}
+        - name: {{ $envVar.name }}
+          value: {{ $envVar.value | quote }}
+        {{- end }}
+        {{- range $envVar := .Values.globalenv }}
+        - name: {{ $envVar.name }}
+          value: {{ $envVar.value | quote }}
+        {{- end }}
       {{- if .Values.useAffinity }}
       affinity:
         nodeAffinity: