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
+15 −6
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
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 @@ -162,6 +162,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 @@ -47,6 +47,12 @@ spec:
{{- tpl (toYaml .) $ | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.flyteadmin.envFrom }}
envFrom:
{{- with .Values.flyteadmin.envFrom -}}
{{- tpl (toYaml .) $ | nindent 12 }}
{{- end }}
{{- end }}
ctso marked this conversation as resolved.
Show resolved Hide resolved
{{- 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 @@ -816,7 +816,7 @@ type: Opaque
---
apiVersion: v1
data:
haSharedSecret: WEJxZGNCTWJiNFUwZEd1bQ==
haSharedSecret: eGJ5UGtPd3FjS1ZKUHBzRg==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -1412,7 +1412,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: 45571013e2bcbc17744162363ccc7fc5c99072b2553a3fe29f41660a07e2e864
checksum/secret: c7e0e9ec1bf8adc0647243b2b84b678b319a75125680e1a20416c433a9ac12a6
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 @@ -796,7 +796,7 @@ type: Opaque
---
apiVersion: v1
data:
haSharedSecret: a1Zqcm1HUlcxZUN4SExqSw==
haSharedSecret: N3lSRVA2Tjk3NVN0RmFReQ==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -1360,7 +1360,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: bf4abdac7aaf5a74cf2f12f7511d4af46e5c2b8228637c5eb29f9ed5399e4942
checksum/secret: c0712053e724267685bc695b8c1ca9656cbaf117cb132897a484553b30b416ba
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: dkdTTTV4ZkNpc2pneXZBRQ==
haSharedSecret: ZHBQc1FjNjhLTGlaMFBQTA==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -934,7 +934,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: 40299f1a8b9fffd1ef10051c289e1d654de7f755fff5f44cde65a9cf96bcd543
checksum/secret: 6443ae7767fff7b93655f39ddacf0246ec37e2a170bb06a00bc62c56ae13e314
labels:
app: docker-registry
release: flyte-sandbox
Expand Down
Loading