Skip to content

Commit c150150

Browse files
authored
helm: Add support for passing env variables to flyteadmin using envFrom (#5216)
* Add support for passing envFrom to flyteadmin Deployment Signed-off-by: Chris Soyars <chris@union.ai> * Cean up indentation Signed-off-by: Chris Soyars <chris@union.ai> * chore: run make helm * chore: run make helm --------- Signed-off-by: Chris Soyars <chris@union.ai>
1 parent 121665d commit c150150

File tree

6 files changed

+15
-6
lines changed

6 files changed

+15
-6
lines changed

charts/flyte-core/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ helm install gateway bitnami/contour -n flyte
178178
| flyteadmin.configPath | string | `"/etc/flyte/config/*.yaml"` | Default regex string for searching configuration files |
179179
| flyteadmin.enabled | bool | `true` | |
180180
| flyteadmin.env | list | `[]` | Additional flyteadmin container environment variables e.g. SendGrid's API key - name: SENDGRID_API_KEY value: "<your sendgrid api key>" e.g. secret environment variable (you can combine it with .additionalVolumes): - name: SENDGRID_API_KEY valueFrom: secretKeyRef: name: sendgrid-secret key: api_key |
181+
| flyteadmin.envFrom | list | `[]` | Additional flyteadmin environment variables from a reference (ie: Secret or ConfigMap) |
181182
| flyteadmin.extraArgs | object | `{}` | Appends extra command line arguments to the serve command |
182183
| flyteadmin.image.pullPolicy | string | `"IfNotPresent"` | |
183184
| flyteadmin.image.repository | string | `"cr.flyte.org/flyteorg/flyteadmin"` | Docker image for Flyteadmin deployment |

charts/flyte-core/templates/admin/deployment.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,13 @@ spec:
4646
{{- with .Values.flyteadmin.env -}}
4747
{{- tpl (toYaml .) $ | nindent 12 }}
4848
{{- end }}
49+
{{- end }}
50+
{{- if .Values.flyteadmin.envFrom }}
51+
envFrom:
52+
{{- with .Values.flyteadmin.envFrom -}}
53+
{{- tpl (toYaml .) $ | nindent 12 }}
4954
{{- end }}
55+
{{- end }}
5056
{{- if .Values.flyteadmin.initialProjects }}
5157
- command:
5258
- flyteadmin

charts/flyte-core/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ flyteadmin:
3131
# name: sendgrid-secret
3232
# key: api_key
3333
env: []
34+
# -- Additional flyteadmin environment variables from a reference (ie: Secret or ConfigMap)
35+
envFrom: []
3436
# -- Default resources requests and limits for Flyteadmin deployment
3537
resources:
3638
limits:

docker/sandbox-bundled/manifests/complete-agent.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@ type: Opaque
819819
---
820820
apiVersion: v1
821821
data:
822-
haSharedSecret: MzdjVFBHVmlTTUJLV2FLRA==
822+
haSharedSecret: UE1mU01ZdUU3Mm1EU0M0dg==
823823
proxyPassword: ""
824824
proxyUsername: ""
825825
kind: Secret
@@ -1416,7 +1416,7 @@ spec:
14161416
metadata:
14171417
annotations:
14181418
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
1419-
checksum/secret: 51eef38b8d9341f4897669e28bab62b0ef7f2a690e6c78756e25dff548f68c57
1419+
checksum/secret: f41ce2d3d3713b025ef28e36a69f78f91ed84b132cc9cb337dd7d23ad9783615
14201420
labels:
14211421
app: docker-registry
14221422
release: flyte-sandbox

docker/sandbox-bundled/manifests/complete.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ type: Opaque
801801
---
802802
apiVersion: v1
803803
data:
804-
haSharedSecret: QzdpNFV1b01KaVpCZ3NrbQ==
804+
haSharedSecret: UzlMUFQ4QmRVb05pbHZNUw==
805805
proxyPassword: ""
806806
proxyUsername: ""
807807
kind: Secret
@@ -1365,7 +1365,7 @@ spec:
13651365
metadata:
13661366
annotations:
13671367
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
1368-
checksum/secret: 14a953a34adb01e2532145c9fc3eec829b95c5515b181f8877e9837c8ff5ed10
1368+
checksum/secret: ed16cace6787759cf9bbaa202aa5d2942f803ca84fca4a54c2c4128ea9a42d94
13691369
labels:
13701370
app: docker-registry
13711371
release: flyte-sandbox

docker/sandbox-bundled/manifests/dev.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ metadata:
499499
---
500500
apiVersion: v1
501501
data:
502-
haSharedSecret: SmFESFBwbUNNYWxHYWlzYQ==
502+
haSharedSecret: SnZMbUdvd29EbDF1ckJlVA==
503503
proxyPassword: ""
504504
proxyUsername: ""
505505
kind: Secret
@@ -934,7 +934,7 @@ spec:
934934
metadata:
935935
annotations:
936936
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
937-
checksum/secret: cdfbf45c37e81185184e6abf451cbe04ab03e455ccfd425e83f2e6fddb0b4339
937+
checksum/secret: d28e9a7527a41cb3e2b70a28d1bd8aced26f0577ce1b5eea807968f112328499
938938
labels:
939939
app: docker-registry
940940
release: flyte-sandbox

0 commit comments

Comments
 (0)