helm: Add support for passing env variables to flyteadmin using envFr…

…om (#5216) * Add support for passing envFrom to flyteadmin Deployment Signed-off-by: Chris Soyars <[email protected]> * Cean up indentation Signed-off-by: Chris Soyars <[email protected]> * chore: run make helm * chore: run make helm --------- Signed-off-by: Chris Soyars <[email protected]>
flyteorg · Nov 26, 2024 · c150150 · c150150
1 parent 121665d
commit c150150
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/charts/flyte-core/README.md b/charts/flyte-core/README.md
@@ -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 |

diff --git a/charts/flyte-core/templates/admin/deployment.yaml b/charts/flyte-core/templates/admin/deployment.yaml
@@ -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

diff --git a/charts/flyte-core/values.yaml b/charts/flyte-core/values.yaml
@@ -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:

diff --git a/docker/sandbox-bundled/manifests/complete-agent.yaml b/docker/sandbox-bundled/manifests/complete-agent.yaml
@@ -819,7 +819,7 @@ type: Opaque
 ---
 apiVersion: v1
 data:
-  haSharedSecret: MzdjVFBHVmlTTUJLV2FLRA==
+  haSharedSecret: UE1mU01ZdUU3Mm1EU0M0dg==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -1416,7 +1416,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: 51eef38b8d9341f4897669e28bab62b0ef7f2a690e6c78756e25dff548f68c57
+        checksum/secret: f41ce2d3d3713b025ef28e36a69f78f91ed84b132cc9cb337dd7d23ad9783615
       labels:
         app: docker-registry
         release: flyte-sandbox

diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml
@@ -801,7 +801,7 @@ type: Opaque
 ---
 apiVersion: v1
 data:
-  haSharedSecret: QzdpNFV1b01KaVpCZ3NrbQ==
+  haSharedSecret: UzlMUFQ4QmRVb05pbHZNUw==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -1365,7 +1365,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: 14a953a34adb01e2532145c9fc3eec829b95c5515b181f8877e9837c8ff5ed10
+        checksum/secret: ed16cace6787759cf9bbaa202aa5d2942f803ca84fca4a54c2c4128ea9a42d94
       labels:
         app: docker-registry
         release: flyte-sandbox

diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml
@@ -499,7 +499,7 @@ metadata:
 ---
 apiVersion: v1
 data:
-  haSharedSecret: SmFESFBwbUNNYWxHYWlzYQ==
+  haSharedSecret: SnZMbUdvd29EbDF1ckJlVA==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -934,7 +934,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: cdfbf45c37e81185184e6abf451cbe04ab03e455ccfd425e83f2e6fddb0b4339
+        checksum/secret: d28e9a7527a41cb3e2b70a28d1bd8aced26f0577ce1b5eea807968f112328499
       labels:
         app: docker-registry
         release: flyte-sandbox