Skip to content
This repository was archived by the owner on Jul 19, 2023. It is now read-only.

Commit d55c448

Browse files
authored
Merge pull request #393 from nlamirault/feat/env-from-secrets
[Helm] Load environment variables from secrets
2 parents b56a26e + e9f1f1c commit d55c448

File tree

4 files changed

+9
-0
lines changed

4 files changed

+9
-0
lines changed

operations/phlare/helm/phlare/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
| phlare.components | object | `{}` | |
2020
| phlare.config | string | The config depends on other values been set, details can be found in [`values.yaml`](./values.yaml) | Contains Phlare's configuration as a string. |
2121
| phlare.extraArgs."log.level" | string | `"debug"` | |
22+
| phlare.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the pods |
2223
| phlare.extraEnvVars | object | `{}` | |
2324
| phlare.extraLabels | object | `{}` | |
2425
| phlare.extraVolumeMounts | list | `[]` | |

operations/phlare/helm/phlare/templates/deployments-statefulsets.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ spec:
6565
value: {{ $value | quote }}
6666
{{- end }}
6767
{{- end }}
68+
{{- with $values.extraEnvFrom }}
69+
envFrom:
70+
{{- toYaml . | nindent 12 }}
71+
{{- end }}
6872
ports:
6973
- name: {{ $values.service.port_name }}
7074
containerPort: {{ $values.service.port }}

operations/phlare/helm/phlare/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ phlare:
2020
# The following environment variables are set by the Helm chart.
2121
# JAEGER_AGENT_HOST: jaeger-agent.jaeger.svc.cluster.local.
2222

23+
# -- Environment variables from secrets or configmaps to add to the pods
24+
extraEnvFrom: []
25+
2326
imagePullSecrets: []
2427
nameOverride: ""
2528
fullnameOverride: ""

operations/phlare/jsonnet/values.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"extraArgs": {
3434
"log.level": "debug"
3535
},
36+
"extraEnvFrom": [],
3637
"extraEnvVars": {},
3738
"extraLabels": {},
3839
"extraVolumeMounts": [],

0 commit comments

Comments
 (0)