Repository navigation
Concatenate platformEnvVars ahead of extraEnvVars - #112
Open
Erik Weathers (erikdw) wants to merge 4 commits into
Open
Erik Weathers (erikdw) wants to merge 4 commits into
Erik Weathers (erikdw) wants to merge 4 commits into
Conversation
S3-compatible GCS needs AWS_REGION. Write it from objectStorage.google.region so a later api.extraEnvVars replacement cannot remove it, and fail the render when neither that value nor an explicit AWS_REGION is set. Co-authored-by: Cursor <cursoragent@cursor.com>
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: b9887e1cc2
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "Codex (@codex) review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "Codex (@codex) address that feedback".
Helm replaces extraEnvVars lists, so required settings such as the GCS region were wiped by customer overrides. moduleEnvVars is reserved for Terraform and rendered first. The kubelet keeps the last duplicate name, so extraEnvVars still wins. A Google HMAC deploy with no AWS_REGION in either list fails the render. Co-authored-by: Cursor <cursoragent@cursor.com>
Erik Weathers (erikdw)
changed the title
The list is reserved for the installer. Hand-edited values stay in extraEnvVars, which is still rendered after the platform list so a user entry overrides the same name. Co-authored-by: Cursor <cursoragent@cursor.com>
Erik Weathers (erikdw)
changed the title
A name-only or empty literal entry was enough to pass the guard, so the API could still deploy without a usable region. A valueFrom reference still counts, and a later entry replaces an earlier one. Co-authored-by: Cursor <cursoragent@cursor.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
platformEnvVarslist besideextraEnvVarson the API, Brainstore reader, fast reader, writer, automation writer, and AI Gateway. The installer (the Terraform module) ownsplatformEnvVars. Hand-edited values belong inextraEnvVars. SettingplatformEnvVarsby hand replaces the platform list.platformEnvVarsfirst, thenextraEnvVars. Kubernetes 1.32 kubeletmakeEnvironmentVariableswritescontainer.Envinto a map in order (tmpEnv[name] = value), so the last duplicate name wins. A userextraEnvVarsentry therefore overrides a platform entry of the same name.ENABLE_PROMETHEUS_METRICSstays after both so autoscaling still wins.platformEnvVarsplus poolplatformEnvVars, then baseextraEnvVarsplus poolextraEnvVars.mergeOverwriteno longer drops the shared platform list on ingest or background.cloud=googleandapi.enableGcsAuthis false unless the combined API lists containAWS_REGION. A whitespace-only name does not count. Native GCS auth does not require the region.AWS_REGIONonly inextraEnvVars(old modules) still passes. The same combined list satisfies thePRIMARY_ORG_NAMEcheck.AWS_REGIONinextraEnvVars.Chart.yamlis unchanged. Publish this as 6.25.0 before merging the GKE module PR. If the published version differs, update that floor.Linear: https://linear.app/braintrustdata/issue/INF-782/helm-replaces-apiextraenvvars-and-drops-module-injected-aws-region-on
Test plan
helm unittest braintrust(429 tests): pool concat on default, ingest, and background; user entry last when names collide; Google HMAC failure with neither list; success from either list; native GCS auth;PRIMARY_ORG_NAMEviaplatformEnvVars; Brainstore writer orderhelm templateof the Google CI values and the three Google exampleshelm templatewith neither list set fails with the AWS_REGION guardhelm lint braintrust --strict