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.

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: Use k8s EnvVar for proxy.ExperimentalEnv #11923

Merged
merged 1 commit into from
Jan 15, 2024
Merged

Conversation

siggy
Copy link
Member

@siggy siggy commented Jan 12, 2024

PR #11874 introduced a proxy.ExperimentalEnv setting, allowing arbitrary name+value environment variables on proxies. This name+value pairing was a subset of k8s' environment variables, specifically, it did not allow for valueFrom.configMapKeyRef and related fields. PR #11908 introduced this pattern in the ControlPlane containers.

Modify proxy.ExperimentalEnv to behave identically to k8s' native EnvVar, allowing settings such as:

--set proxy.experimentalEnv[0].name=LINKERD2_PROXY_DEFROBINATION
--set proxy.experimentalEnv[0].valueFrom.configMapKeyRef.key=extreme-key
--set proxy.experimentalEnv[0].valueFrom.configMapKeyRef.name=extreme-config

Context:
#11908 (comment)

@siggy siggy self-assigned this Jan 12, 2024
@siggy siggy requested a review from a team as a code owner January 12, 2024 17:55
@siggy siggy force-pushed the siggy/proxy-env-var branch from 169df30 to 627bf0d Compare January 12, 2024 17:55
PR #11874 introduced a `proxy.ExperimentalEnv` setting, allowing
arbitrary name+value environment variables on proxies. This name+value
pairing was a subset of k8s' environment variables, specifically, it did
not allow for `valueFrom.configMapKeyRef` and related fields. PR #11908
introduced this pattern in the ControlPlane containers.

Modify `proxy.ExperimentalEnv` to behave identically to k8s' native
`EnvVar`, allowing settings such as:
```
--set proxy.experimentalEnv[0].name=LINKERD2_PROXY_DEFROBINATION
--set proxy.experimentalEnv[0].valueFrom.configMapKeyRef.key=extreme-key
--set proxy.experimentalEnv[0].valueFrom.configMapKeyRef.name=extreme-config
```

Context:
#11908 (comment)

Signed-off-by: Andrew Seigner <[email protected]>
@siggy siggy force-pushed the siggy/proxy-env-var branch from 627bf0d to b6075f0 Compare January 14, 2024 05:14
@mateiidavid mateiidavid merged commit b9546af into main Jan 15, 2024
34 checks passed
@mateiidavid mateiidavid deleted the siggy/proxy-env-var branch January 15, 2024 10:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants