Skip to content

fix: pass admintools.additionalEnv to create-store and manage-schema containers (#865) #874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robholland merged 1 commit into from
Apr 2, 2026
Merged

fix: pass admintools.additionalEnv to create-store and manage-schema containers (#865) #874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions charts/temporal/templates/server-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,20 @@ spec:
{{- end }}
env:
{{- include "temporal.admintools-env" (list $ $store) | nindent 12 }}
{{- with $.Values.admintools.additionalEnv }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- if or $.Values.admintools.additionalEnvSecretName $.Values.admintools.additionalEnvConfigMapName }}
envFrom:
{{- with $.Values.admintools.additionalEnvSecretName }}
- secretRef:
name: {{ . }}
{{- end }}
{{- with $.Values.admintools.additionalEnvConfigMapName }}
- configMapRef:
name: {{ . }}
{{- end }}
{{- end }}
{{- with $.Values.admintools.additionalVolumeMounts }}
volumeMounts:
{{- toYaml . | nindent 12 }}
Expand Down Expand Up @@ -80,6 +94,20 @@ spec:
{{- end }}
env:
{{- include "temporal.admintools-env" (list $ $store) | nindent 12 }}
{{- with $.Values.admintools.additionalEnv }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- if or $.Values.admintools.additionalEnvSecretName $.Values.admintools.additionalEnvConfigMapName }}
envFrom:
{{- with $.Values.admintools.additionalEnvSecretName }}
- secretRef:
name: {{ . }}
{{- end }}
{{- with $.Values.admintools.additionalEnvConfigMapName }}
- configMapRef:
name: {{ . }}
{{- end }}
{{- end }}
volumeMounts:
{{- with $.Values.admintools.additionalVolumeMounts }}
{{- toYaml . | nindent 12 }}
Expand Down
43 changes: 43 additions & 0 deletions charts/temporal/tests/server_job_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,15 @@ tests:
datastores:
default:
sql:
createDatabase: true
manageSchema: true
pluginName: mysql8
connectAddr: "temporal-persistence:3306"
databaseName: temporal
visibility:
sql:
createDatabase: true
manageSchema: true
pluginName: mysql8
connectAddr: "temporal-visibility:3306"
databaseName: temporal_visibility
Expand All @@ -71,6 +75,45 @@ tests:
additionalEnvSecretName: env-secret
additionalEnvConfigMapName: env-configmap
asserts:
# create-*-store containers
- equal:
path: spec.template.spec.initContainers[?(@.name=="create-default-store")].env[?(@.name=="MY_ENV_VAR")].value
value: my-value
- equal:
path: spec.template.spec.initContainers[?(@.name=="create-default-store")].envFrom[0].secretRef.name
value: env-secret
- equal:
path: spec.template.spec.initContainers[?(@.name=="create-default-store")].envFrom[1].configMapRef.name
value: env-configmap
- equal:
path: spec.template.spec.initContainers[?(@.name=="create-visibility-store")].env[?(@.name=="MY_ENV_VAR")].value
value: my-value
- equal:
path: spec.template.spec.initContainers[?(@.name=="create-visibility-store")].envFrom[0].secretRef.name
value: env-secret
- equal:
path: spec.template.spec.initContainers[?(@.name=="create-visibility-store")].envFrom[1].configMapRef.name
value: env-configmap
# manage-schema-*-store containers
- equal:
path: spec.template.spec.initContainers[?(@.name=="manage-schema-default-store")].env[?(@.name=="MY_ENV_VAR")].value
value: my-value
- equal:
path: spec.template.spec.initContainers[?(@.name=="manage-schema-default-store")].envFrom[0].secretRef.name
value: env-secret
- equal:
path: spec.template.spec.initContainers[?(@.name=="manage-schema-default-store")].envFrom[1].configMapRef.name
value: env-configmap
- equal:
path: spec.template.spec.initContainers[?(@.name=="manage-schema-visibility-store")].env[?(@.name=="MY_ENV_VAR")].value
value: my-value
- equal:
path: spec.template.spec.initContainers[?(@.name=="manage-schema-visibility-store")].envFrom[0].secretRef.name
value: env-secret
- equal:
path: spec.template.spec.initContainers[?(@.name=="manage-schema-visibility-store")].envFrom[1].configMapRef.name
value: env-configmap
# create-*-namespace containers
- equal:
path: spec.template.spec.initContainers[?(@.name=="create-default-namespace")].env[?(@.name=="MY_ENV_VAR")].value
value: my-value
Expand Down
Loading