rename iocLocation to epicsDomain

Author: gilesknap

Charts/dev-c7/templates/statefulset.yaml

@@ -54,13 +54,13 @@ spec:
             {{- .Values.command | toYaml | nindent 12 }}
           stdin: true
           tty: true
-          {{- $iocLocation := (.Values.iocLocation | default $location) | upper }}
+          {{- $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 $iocLocation $iocName .Values.iocVersion }}
+            {{- $workingDir = printf "/dls_sw/prod/%s/ioc/%s/%s/%s" .Values.epicsVersion $epicsDomain $iocName .Values.iocVersion }}
           {{- end }}
           workingDir: {{ $workingDir }}
           {{- with .Values.securityContext }}

Charts/dev-c7/values.schema.json

@@ -8,6 +8,12 @@
             "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.33.3/affinity.json",
             "type": "object"
         },
+        "args": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
         "autosavePath": {
             "description": "Full path to an IOC instance's autosave folder. Overrides autosaveRootPath when not blank",
             "type": "string"
@@ -22,6 +28,10 @@
                 "type": "string"
             }
         },
+        "epicsDomain": {
+            "description": "IOCs DLS EPICS Domain (e.g. BL16I FE02J SR03C)",
+            "type": "string"
+        },
         "epicsVersion": {
             "description": "the EPICS version, used to generate the /dls_sw/prod path to iocName",
             "type": "string"
@@ -56,10 +66,6 @@
         "imagePullSecrets": {
             "type": "array"
         },
-        "iocLocation": {
-            "description": "the IOC location (e.g. BL16I FE02J SR03C)",
-            "type": "string"
-        },
         "iocName": {
             "description": "the folder name for the compiled IOC, defaults to ucase of the services folder name",
             "type": "string"

Charts/dev-c7/values.yaml

@@ -12,8 +12,8 @@
 iocName: ""
 # @schema description: the IOC release, used to generate the /dls_sw/prod path to iocName
 iocVersion: ""
-# @schema description: the IOC location (e.g. BL16I FE02J SR03C)
-iocLocation: ""
+# @schema description: IOCs DLS EPICS Domain (e.g. BL16I FE02J SR03C)
+epicsDomain: ""
 # @schema description: the EPICS version, used to generate the /dls_sw/prod path to iocName
 epicsVersion: R3.14.12.7
 
@@ -36,7 +36,10 @@ image:
 command:
   - bash
   - -lc
-  - stdio-expose ./bin/linux-x86_64/st*.sh
+  - stdio-expose
+
+args:
+  - ./bin/linux-x86_64/st*.sh
 
 # @schema description: enable host networking for the pod
 hostNetwork: false
@@ -86,6 +89,9 @@ volumes:
   - name: etc
     hostPath:
       path: /dls_sw/etc
+  - name: apps
+    hostPath:
+      path: /dls_sw/apps
 
 # volumeMounts for the Deployment.
 # @schema $ref: $k8s/container.json#/properties/volumeMounts