helm: Add experimentalEnv settings
#11908
Merged
Conversation
This file contains 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
siggy
force-pushed
the
siggy/env
branch
3 times, most recently
from
2ecf917 to
ea2ffa6
Compare
Enable setting arbitrary environment variables on all Go-based Control
Plane containers
For example, via CLI:
```
--set destinationController.experimentalEnv[0].name=ENV_VAR,destinationController.experimentalEnv[0].value=ENV_VAL
```
Via values file:
```
destinationController:
experimentalEnv:
- name: DEST_ENV_VAR
value: DEST_ENV_VAL
- name: DEST_CONFIG_MAP_VAR
valueFrom:
configMapKeyRef:
key: dest_config_map_key
name: dest-config-map-name
heartbeat:
experimentalEnv:
identity:
experimentalEnv:
proxyInjector:
experimentalEnv:
spValidator:
experimentalEnv:
serviceMirrorExperimentalEnv:
```
Relates to #11862 and #11874
Signed-off-by: Andrew Seigner <[email protected]>
olix0r
reviewed
Jan 11, 2024
| @@ -208,6 +208,10 @@ spec: | |||
| {{- range (.Values.destinationController).experimentalArgs }} | |||
| - {{ . }} | |||
| {{- end }} | |||
| {{- with (.Values.destinationController).experimentalEnv }} | |||
| env: | |||
| {{- toYaml . | nindent 8 -}} | |||
There was a problem hiding this comment.
It looks like these configurations work differently from those of the proxy's experimentalEnv settings which are expressed as objects instead of as lists of name/values. Is this intentional?
There was a problem hiding this comment.
It is intentional. It allows for things like this:
destinationController:
experimentalEnv:
- name: ENV_VAR
valueFrom:
configMapKeyRef:
key: env-var-key
name: my-config-map
adleong
approved these changes
Jan 11, 2024
|
We should probably follow-up to update the proxy settings to match this so they are consistent. |
olix0r
approved these changes
Jan 12, 2024
mateiidavid
approved these changes
Jan 12, 2024
siggy
added a commit
that referenced
this pull request
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 variable, 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
added a commit
that referenced
this pull request
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 variable, 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
added a commit
that referenced
this pull request
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) Signed-off-by: Andrew Seigner <[email protected]>
siggy
added a commit
that referenced
this pull request
Jan 14, 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) Signed-off-by: Andrew Seigner <[email protected]>
mateiidavid
pushed a commit
that referenced
this pull request
Jan 15, 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) Signed-off-by: Andrew Seigner <[email protected]>
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.
Enable setting arbitrary environment variables on all Go-based Control Plane containers
For example, via CLI:
Via values file:
Relates to #11862 and #11874