Skip to content

Commit 3f808f2

Browse files
committed
feat: add postInitContainers for admintools server job
1 parent 22413b6 commit 3f808f2

6 files changed

Lines changed: 31 additions & 1 deletion

File tree

charts/temporal/templates/admintools-deployment.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ spec:
2626
initContainers:
2727
{{- toYaml .| nindent 8 }}
2828
{{- end }}
29+
{{- with $.Values.admintools.postInitContainers }}
30+
{{- toYaml . | nindent 8 }}
31+
{{- end }}
2932
containers:
3033
- name: admin-tools
3134
image: "{{ .Values.admintools.image.repository }}:{{ .Values.admintools.image.tag }}"

charts/temporal/templates/server-deployment.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
{{- toYaml . | nindent 8 }}
3939
{{- end }}
4040
{{- end }}
41-
{{- if or (or $.Values.server.additionalInitContainers $.Values.cassandra.enabled) (or $.Values.elasticsearch.enabled $.Values.elasticsearch.external)}}
41+
{{- if or (or $.Values.server.additionalInitContainers $.Values.cassandra.enabled) (or $.Values.elasticsearch.enabled $.Values.elasticsearch.external) $.Values.server.postInitContainers }}
4242
initContainers:
4343
{{- with $.Values.server.additionalInitContainers }}
4444
{{- toYaml . | nindent 8}}
@@ -73,6 +73,9 @@ spec:
7373
{{- toYaml . | nindent 12 }}
7474
{{- end }}
7575
{{- end }}
76+
{{- with $.Values.server.postInitContainers }}
77+
{{- toYaml . | nindent 8 }}
78+
{{- end }}
7679
{{- end }}
7780
containers:
7881
- name: {{ $.Chart.Name }}-{{ $service }}

charts/temporal/templates/server-job.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,9 @@ spec:
182182
{{- end }}
183183
{{- end }}
184184
{{- end }}
185+
{{- with $.Values.schema.postInitContainers }}
186+
{{- toYaml . | nindent 8 }}
187+
{{- end }}
185188
containers:
186189
- name: done
187190
image: "{{ $.Values.admintools.image.repository }}:{{ $.Values.admintools.image.tag }}"

charts/temporal/tests/server_deployment_test.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,13 @@ tests:
8585
path: spec.template.metadata.annotations["prometheus.io/scrape"]
8686
- notExists:
8787
path: spec.template.metadata.annotations["prometheus.io/port"]
88+
- it: includes postInit containers
89+
template: templates/server-deployment.yaml
90+
set:
91+
server:
92+
postInitContainers:
93+
- name: my-post-init-container
94+
asserts:
95+
- equal:
96+
path: spec.template.spec.initContainers[-1].name
97+
value: my-post-init-container

charts/temporal/tests/server_job_test.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ tests:
1919
- equal:
2020
path: spec.template.spec.initContainers[0].name
2121
value: my-init-container
22+
- it: includes postInit containers
23+
set:
24+
schema:
25+
postInitContainers:
26+
- name: my-post-init-container
27+
asserts:
28+
- equal:
29+
path: spec.template.spec.initContainers[-1].name
30+
value: my-post-init-container
2231
- it: includes additional volumes
2332
set:
2433
admintools:

charts/temporal/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ server:
8989
additionalEnv: []
9090
# for sidecar containers, add containers here with restartPolicy: Always
9191
additionalInitContainers: []
92+
postInitContainers: []
9293
securityContext:
9394
fsGroup: 1000
9495
runAsUser: 1000
@@ -450,6 +451,7 @@ schema:
450451
resources: {}
451452
containerSecurityContext: {}
452453
securityContext: {}
454+
postInitContainers: []
453455
elasticsearch:
454456
enabled: true
455457
replicas: 3

0 commit comments

Comments
 (0)