Skip to content

Commit dee3a77

Browse files
committed
fix args
1 parent 2f01c95 commit dee3a77

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

Charts/dev-c7/templates/statefulset.yaml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,27 +52,29 @@ spec:
5252
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
5353
command:
5454
{{- .Values.command | toYaml | nindent 12 }}
55+
args:
56+
{{- .Values.args | toYaml | nindent 12 }}
5557
stdin: true
5658
tty: true
5759
{{- $epicsDomain := (.Values.epicsDomain | default $location) | upper }}
5860
{{- $iocName := (.Values.iocName | default .Release.Name) | upper }}
59-
{{ $workingDir := .Values.workingDir }}
60-
{{ if eq $workingDir "" }}
61+
{{- $workingDir := .Values.workingDir }}
62+
{{- if eq $workingDir "" }}
6163
{{- if .Values.iocPath }}
6264
{{- $workingDir = printf "%s/%s" .Values.iocPath $iocName }}
6365
{{- else }}
6466
{{- $workingDir = printf "/dls_sw/prod/%s/ioc/%s/%s/%s" .Values.epicsVersion $epicsDomain $iocName .Values.iocVersion }}
6567
{{- end }}
66-
{{ end }}
68+
{{- end }}
6769
workingDir: {{ .Values.workingDir | default $workingDir }}
6870
{{- with .Values.securityContext }}
6971
securityContext:
7072
{{- toYaml . | nindent 12 }}
7173
{{- end }}
7274
env:
73-
# psuedo home sets up epics module etc.
74-
- name: HOME
75-
value: /epicsHome
75+
# psuedo home sets up epics module etc.
76+
- name: HOME
77+
value: /epicsHome
7678
imagePullPolicy: {{ .Values.image.pullPolicy }}
7779
{{- with .Values.livenessProbe }}
7880
livenessProbe:
@@ -89,7 +91,7 @@ spec:
8991
{{- with .Values.volumeMounts }}
9092
volumeMounts:
9193
{{- toYaml . | nindent 12 }}
92-
{{ - with .Values.extraVolumeMounts }}
94+
{{- with $.Values.extraVolumeMounts }}
9395
{{- toYaml . | nindent 12 }}
9496
{{- end }}
9597
{{- end }}
@@ -107,7 +109,7 @@ spec:
107109
{{- with .Values.volumes }}
108110
volumes:
109111
{{- toYaml . | nindent 8 }}
110-
{{ - with .Values.extraVolumes }}
112+
{{- with $.Values.extraVolumes }}
111113
{{- toYaml . | nindent 8 }}
112114
{{- end }}
113115
{{- end }}

Charts/dev-c7/values.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,9 @@ image:
3737
command:
3838
- bash
3939
- -lc
40-
- stdio-expose
4140

4241
args:
43-
- ./bin/linux-x86_64/st*.sh
42+
- stdio-expose ./bin/linux-x86_64/st*.sh
4443

4544
# @schema description: enable host networking for the pod
4645
hostNetwork: false
@@ -90,9 +89,6 @@ volumes:
9089
- name: etc
9190
hostPath:
9291
path: /dls_sw/etc
93-
- name: apps
94-
hostPath:
95-
path: /dls_sw/apps
9692

9793
# extraVolumes for the Deployment.
9894
# @schema description: add extra volumes without overriding the default ones

0 commit comments

Comments
 (0)