Skip to content
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

Jump to bottom

feat(helm): add configurable extraEnvFrom to admin-api and enterprisegw #14533

Merged
merged 1 commit into from
Oct 18, 2024
Merged

feat(helm): add configurable extraEnvFrom to admin-api and enterprisegw #14533

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
20 changes: 20 additions & 0 deletions docs/sources/setup/install/helm/reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ This is the generated reference for the Loki Helm Chart values.
"env": [],
"extraArgs": {},
"extraContainers": [],
"extraEnvFrom": [],
"extraVolumeMounts": [],
"extraVolumes": [],
"hostAliases": [],
Expand Down Expand Up @@ -129,6 +130,15 @@ This is the generated reference for the Loki Helm Chart values.
<td><pre lang="json">
[]
</pre>
</td>
</tr>
<tr>
<td>adminApi.extraEnvFrom</td>
<td>list</td>
<td>Environment variables from secrets or configmaps to add to the admin-api pods</td>
<td><pre lang="json">
[]
</pre>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -3616,6 +3626,7 @@ false
"env": [],
"extraArgs": {},
"extraContainers": [],
"extraEnvFrom": [],
"extraVolumeMounts": [],
"extraVolumes": [],
"hostAliases": [],
Expand Down Expand Up @@ -3695,6 +3706,15 @@ false
<td><pre lang="json">
[]
</pre>
</td>
</tr>
<tr>
<td>enterpriseGateway.extraEnvFrom</td>
<td>list</td>
<td>Environment variables from secrets or configmaps to add to the enterprise gateway pods</td>
<td><pre lang="json">
[]
</pre>
</td>
</tr>
<tr>
Expand Down
4 changes: 4 additions & 0 deletions production/helm/loki/templates/admin-api/deployment-admin-api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ spec:
{{- if .Values.adminApi.env }}
{{ toYaml .Values.adminApi.env | nindent 12 }}
{{- end }}
{{- with .Values.adminApi.extraEnvFrom }}
envFrom:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.adminApi.extraContainers }}
{{ toYaml . | nindent 8 }}
{{- end }}
Expand Down
4 changes: 4 additions & 0 deletions production/helm/loki/templates/gateway/deployment-gateway-enterprise.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ spec:
{{- if .Values.enterpriseGateway.env }}
{{ toYaml .Values.enterpriseGateway.env | nindent 12 }}
{{- end }}
{{- with .Values.enterpriseGateway.extraEnvFrom }}
envFrom:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.enterpriseGateway.extraContainers }}
{{ toYaml . | nindent 8 }}
{{- end }}
Expand Down
4 changes: 4 additions & 0 deletions production/helm/loki/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,8 @@ adminApi:
# - domain.tld
# -- Additional CLI arguments for the `admin-api` target
extraArgs: {}
# -- Environment variables from secrets or configmaps to add to the admin-api pods
extraEnvFrom: []
# -- Additional labels for the `admin-api` Deployment
labels: {}
# -- Additional annotations for the `admin-api` Deployment
Expand Down Expand Up @@ -1099,6 +1101,8 @@ enterpriseGateway:
# - domain.tld
# -- Additional CLI arguments for the `gateway` target
extraArgs: {}
# -- Environment variables from secrets or configmaps to add to the enterprise gateway pods
extraEnvFrom: []
# -- Additional labels for the `gateway` Pod
labels: {}
# -- Additional annotations for the `gateway` Pod
Expand Down
Loading