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

helm: Add support for passing env variables to flyteadmin using envFrom #5216

Merged
merged 5 commits into from
Nov 26, 2024
Merged

helm: Add support for passing env variables to flyteadmin using envFrom #5216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ff19da
Add support for passing envFrom to flyteadmin Deployment
ctso Apr 10, 2024
acf00e7
Cean up indentation
ctso Apr 11, 2024
1864968
chore: run make helm
ctso Nov 26, 2024
c62ec55
Merge remote-tracking branch 'upstream/master' into ctso/flyte-core-c…
ctso Nov 26, 2024
21c9740
chore: run make helm
ctso Nov 26, 2024
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
1 change: 1 addition & 0 deletions charts/flyte-core/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ helm install gateway bitnami/contour -n flyte
| flyteadmin.configPath | string | `"/etc/flyte/config/*.yaml"` | Default regex string for searching configuration files |
| flyteadmin.enabled | bool | `true` | |
| 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 |
| flyteadmin.envFrom | list | `[]` | Additional flyteadmin environment variables from a reference (ie: Secret or ConfigMap) |
| flyteadmin.extraArgs | object | `{}` | Appends extra command line arguments to the serve command |
| flyteadmin.image.pullPolicy | string | `"IfNotPresent"` | |
| flyteadmin.image.repository | string | `"cr.flyte.org/flyteorg/flyteadmin"` | Docker image for Flyteadmin deployment |
Expand Down
6 changes: 6 additions & 0 deletions charts/flyte-core/templates/admin/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,13 @@ spec:
{{- with .Values.flyteadmin.env -}}
{{- tpl (toYaml .) $ | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.flyteadmin.envFrom }}
envFrom:
{{- with .Values.flyteadmin.envFrom -}}
{{- tpl (toYaml .) $ | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.flyteadmin.initialProjects }}
- command:
- flyteadmin
Expand Down
2 changes: 2 additions & 0 deletions charts/flyte-core/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ flyteadmin:
# name: sendgrid-secret
# key: api_key
env: []
# -- Additional flyteadmin environment variables from a reference (ie: Secret or ConfigMap)
envFrom: []
# -- Default resources requests and limits for Flyteadmin deployment
resources:
limits:
Expand Down
4 changes: 2 additions & 2 deletions docker/sandbox-bundled/manifests/complete-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ type: Opaque
---
apiVersion: v1
data:
haSharedSecret: MzdjVFBHVmlTTUJLV2FLRA==
haSharedSecret: UE1mU01ZdUU3Mm1EU0M0dg==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -1416,7 +1416,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: 51eef38b8d9341f4897669e28bab62b0ef7f2a690e6c78756e25dff548f68c57
checksum/secret: f41ce2d3d3713b025ef28e36a69f78f91ed84b132cc9cb337dd7d23ad9783615
labels:
app: docker-registry
release: flyte-sandbox
Expand Down
4 changes: 2 additions & 2 deletions docker/sandbox-bundled/manifests/complete.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ type: Opaque
---
apiVersion: v1
data:
haSharedSecret: QzdpNFV1b01KaVpCZ3NrbQ==
haSharedSecret: UzlMUFQ4QmRVb05pbHZNUw==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -1365,7 +1365,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: 14a953a34adb01e2532145c9fc3eec829b95c5515b181f8877e9837c8ff5ed10
checksum/secret: ed16cace6787759cf9bbaa202aa5d2942f803ca84fca4a54c2c4128ea9a42d94
labels:
app: docker-registry
release: flyte-sandbox
Expand Down
4 changes: 2 additions & 2 deletions docker/sandbox-bundled/manifests/dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ metadata:
---
apiVersion: v1
data:
haSharedSecret: SmFESFBwbUNNYWxHYWlzYQ==
haSharedSecret: SnZMbUdvd29EbDF1ckJlVA==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -934,7 +934,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: cdfbf45c37e81185184e6abf451cbe04ab03e455ccfd425e83f2e6fddb0b4339
checksum/secret: d28e9a7527a41cb3e2b70a28d1bd8aced26f0577ce1b5eea807968f112328499
labels:
app: docker-registry
release: flyte-sandbox
Expand Down
Loading