add workingDir override

Author: gilesknap

Charts/dev-c7/templates/statefulset.yaml

@@ -56,13 +56,15 @@ spec:
           tty: true
           {{- $epicsDomain := (.Values.epicsDomain | default $location) | upper }}
           {{- $iocName := (.Values.iocName | default .Release.Name) | upper }}
-          {{ $workingDir := "" }} {{- /* create the variable in global scope before setting in if/else!!! */ -}}
-          {{- if .Values.iocPath }}
-            {{- $workingDir = printf "%s/%s" .Values.iocPath $iocName }}
-          {{- else }}
-            {{- $workingDir = printf "/dls_sw/prod/%s/ioc/%s/%s/%s" .Values.epicsVersion $epicsDomain $iocName .Values.iocVersion }}
-          {{- end }}
-          workingDir: {{ $workingDir }}
+          {{ $workingDir := .Values.workingDir }}
+          {{ if eq $workingDir  "" }}
+            {{- if .Values.iocPath }}
+              {{- $workingDir = printf "%s/%s" .Values.iocPath $iocName }}
+            {{- else }}
+              {{- $workingDir = printf "/dls_sw/prod/%s/ioc/%s/%s/%s" .Values.epicsVersion $epicsDomain $iocName .Values.iocVersion }}
+            {{- end }}
+          {{ end }}
+          workingDir: {{ .Values.workingDir | default $workingDir }}
           {{- with .Values.securityContext }}
           securityContext:
             {{- toYaml . | nindent 12 }}

Charts/dev-c7/values.schema.json

@@ -146,6 +146,10 @@
                     }
                 }
             }
+        },
+        "workingDir": {
+            "description": "override the cwd for launching the IOC, defaults to /dls_sw/prod/$epicsVersion/ioc/$epicsDomain/$iocName/$iocVersion",
+            "type": "string"
         }
     },
     "additionalProperties": false

Charts/dev-c7/values.yaml

@@ -16,6 +16,8 @@ iocVersion: ""
 epicsDomain: ""
 # @schema description: the EPICS version, used to generate the /dls_sw/prod path to iocName
 epicsVersion: R3.14.12.7
+# @schema description: override the cwd for launching the IOC, defaults to /dls_sw/prod/$epicsVersion/ioc/$epicsDomain/$iocName/$iocVersion
+workingDir: ""
 
 # @schema description: overrides the parent folder for iocName to any path in /dls_sw/work or /dls_sw/prod
 iocPath: ""