linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add `additionalEnv` helm settings (#12080) 

Add `additionalEnv` helm settings to the proxy and controller manifests
alongside the existing `experimentalEnv` ones.
This commit is contained in:
Alejandro Pedraza 2024-02-15 14:26:45 -05:00 committed by GitHub
parent 084f5a95c4
commit 9ac1caaf1b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
24 changed files with 51 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
charts/linkerd-control-plane/templates/destination.yaml
View File

@ -208,10 +208,15 @@ spec:
{{- range (.Values.destinationController).experimentalArgs }}
- {{ . }}
{{- end }}
{{- with (.Values.destinationController).experimentalEnv }}
{{- if or (.Values.destinationController).additionalEnv (.Values.destinationController).experimentalEnv }}
env:
{{- with (.Values.destinationController).additionalEnv }}
{{- toYaml . | nindent 8 -}}
{{- end }}
{{- with (.Values.destinationController).experimentalEnv }}
{{- toYaml . | nindent 8 -}}
{{- end }}
{{- end }}
{{- include "partials.linkerd.trace" . | nindent 8 -}}
image: {{.Values.controllerImage}}:{{.Values.controllerImageVersion | default .Values.linkerdVersion}}
imagePullPolicy: {{.Values.imagePullPolicy}}
@ -249,10 +254,15 @@ spec:
- -log-level={{.Values.controllerLogLevel}}
- -log-format={{.Values.controllerLogFormat}}
- -enable-pprof={{.Values.enablePprof | default false}}
{{- with (.Values.spValidator).experimentalEnv }}
{{- if or (.Values.spValidator).additionalEnv (.Values.spValidator).experimentalEnv }}
env:
{{- with (.Values.spValidator).additionalEnv }}
{{- toYaml . | nindent 8 -}}
{{- end }}
{{- with (.Values.spValidator).experimentalEnv }}
{{- toYaml . | nindent 8 -}}
{{- end }}
{{- end }}
image: {{.Values.controllerImage}}:{{.Values.controllerImageVersion | default .Values.linkerdVersion}}
imagePullPolicy: {{.Values.imagePullPolicy}}
livenessProbe:

3
charts/linkerd-control-plane/templates/heartbeat.yaml
View File

@ -59,6 +59,9 @@ spec:
env:
- name: LINKERD_DISABLED
value: "the heartbeat controller does not use the proxy"
{{- with (.Values.heartbeat).additionalEnv }}
{{- toYaml . | nindent 12 -}}
{{- end }}
{{- with (.Values.heartbeat).experimentalEnv }}
{{- toYaml . | nindent 12 -}}
{{- end }}

3
charts/linkerd-control-plane/templates/identity.yaml
View File

@ -165,6 +165,9 @@ spec:
env:
- name: LINKERD_DISABLED
value: "linkerd-await cannot block the identity controller"
{{- with (.Values.identity).additionalEnv }}
{{- toYaml . | nindent 8 -}}
{{- end }}
{{- with (.Values.identity).experimentalEnv }}
{{- toYaml . | nindent 8 -}}
{{- end }}

7
charts/linkerd-control-plane/templates/proxy-injector.yaml
View File

@ -79,10 +79,15 @@ spec:
- -log-format={{.Values.controllerLogFormat}}
- -linkerd-namespace={{.Release.Namespace}}
- -enable-pprof={{.Values.enablePprof | default false}}
{{- with (.Values.proxyInjector).experimentalEnv }}
{{- if or (.Values.proxyInjector).additionalEnv (.Values.proxyInjector).experimentalEnv }}
env:
{{- with (.Values.proxyInjector).additionalEnv }}
{{- toYaml . | nindent 8 -}}
{{- end }}
{{- with (.Values.proxyInjector).experimentalEnv }}
{{- toYaml . | nindent 8 -}}
{{- end }}
{{- end }}
image: {{.Values.controllerImage}}:{{.Values.controllerImageVersion | default .Values.linkerdVersion}}
imagePullPolicy: {{.Values.imagePullPolicy}}
livenessProbe:

3
charts/partials/templates/_proxy.tpl
View File

@ -160,6 +160,9 @@ be used in other contexts.
- name: LINKERD2_PROXY_SHUTDOWN_GRACE_PERIOD
value: {{.Values.proxy.shutdownGracePeriod | quote}}
{{ end -}}
{{ if .Values.proxy.additionalEnv -}}
{{ toYaml .Values.proxy.additionalEnv }}
{{ end -}}
{{ if .Values.proxy.experimentalEnv -}}
{{ toYaml .Values.proxy.experimentalEnv }}
{{ end -}}

4
cli/cmd/testdata/install_controlplane_tracing_output.golden generated vendored
View File

@ -636,6 +636,7 @@ data:
prometheusUrl: ""
proxy:
accessLog: ""
additionalEnv: null
await: true
capabilities: null
control:
@ -1051,7 +1052,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1388,7 +1388,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1825,7 +1824,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false

4
cli/cmd/testdata/install_custom_domain.golden generated vendored
View File

@ -636,6 +636,7 @@ data:
prometheusUrl: ""
proxy:
accessLog: ""
additionalEnv: null
await: true
capabilities: null
control:
@ -1050,7 +1051,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1387,7 +1387,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1823,7 +1822,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false

4
cli/cmd/testdata/install_custom_registry.golden generated vendored
View File

@ -636,6 +636,7 @@ data:
prometheusUrl: ""
proxy:
accessLog: ""
additionalEnv: null
await: true
capabilities: null
control:
@ -1050,7 +1051,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1387,7 +1387,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1823,7 +1822,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false

4
cli/cmd/testdata/install_default.golden generated vendored
View File

@ -636,6 +636,7 @@ data:
prometheusUrl: ""
proxy:
accessLog: ""
additionalEnv: null
await: true
capabilities: null
control:
@ -1050,7 +1051,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1387,7 +1387,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1823,7 +1822,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false

4
cli/cmd/testdata/install_default_override_dst_get_nets.golden generated vendored
View File

@ -636,6 +636,7 @@ data:
prometheusUrl: ""
proxy:
accessLog: ""
additionalEnv: null
await: true
capabilities: null
control:
@ -1050,7 +1051,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1387,7 +1387,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1823,7 +1822,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false

4
cli/cmd/testdata/install_default_token.golden generated vendored
View File

@ -636,6 +636,7 @@ data:
prometheusUrl: ""
proxy:
accessLog: ""
additionalEnv: null
await: true
capabilities: null
control:
@ -1050,7 +1051,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1378,7 +1378,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1805,7 +1804,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false

4
cli/cmd/testdata/install_ha_output.golden generated vendored
View File

@ -663,6 +663,7 @@ data:
prometheusUrl: ""
proxy:
accessLog: ""
additionalEnv: null
await: true
capabilities: null
control:
@ -1127,7 +1128,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
limits:
memory: "250Mi"
@ -1504,7 +1504,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
limits:
memory: "250Mi"
@ -1976,7 +1975,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
limits:
memory: "250Mi"

4
cli/cmd/testdata/install_ha_with_overrides_output.golden generated vendored
View File

@ -663,6 +663,7 @@ data:
prometheusUrl: ""
proxy:
accessLog: ""
additionalEnv: null
await: true
capabilities: null
control:
@ -1127,7 +1128,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
limits:
memory: "250Mi"
@ -1504,7 +1504,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
limits:
memory: "250Mi"
@ -1976,7 +1975,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
limits:
memory: "250Mi"

4
cli/cmd/testdata/install_heartbeat_disabled_output.golden generated vendored
View File

@ -567,6 +567,7 @@ data:
prometheusUrl: ""
proxy:
accessLog: ""
additionalEnv: null
await: true
capabilities: null
control:
@ -981,7 +982,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1318,7 +1318,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1694,7 +1693,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false

4
cli/cmd/testdata/install_helm_control_plane_output.golden generated vendored
View File

@ -613,6 +613,7 @@ data:
prometheusUrl: ""
proxy:
accessLog: ""
additionalEnv: null
await: true
capabilities: null
control:
@ -1023,7 +1024,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1362,7 +1362,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1802,7 +1801,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false

4
cli/cmd/testdata/install_helm_control_plane_output_ha.golden generated vendored
View File

@ -640,6 +640,7 @@ data:
prometheusUrl: ""
proxy:
accessLog: ""
additionalEnv: null
await: true
capabilities: null
control:
@ -1100,7 +1101,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
limits:
memory: "250Mi"
@ -1479,7 +1479,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
limits:
memory: "250Mi"
@ -1955,7 +1954,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
limits:
memory: "250Mi"

4
cli/cmd/testdata/install_helm_output_ha_labels.golden generated vendored
View File

@ -644,6 +644,7 @@ data:
prometheusUrl: ""
proxy:
accessLog: ""
additionalEnv: null
await: true
capabilities: null
control:
@ -1108,7 +1109,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
limits:
memory: "250Mi"
@ -1491,7 +1491,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
limits:
memory: "250Mi"
@ -1975,7 +1974,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
limits:
memory: "250Mi"

4
cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden generated vendored
View File

@ -635,6 +635,7 @@ data:
prometheusUrl: ""
proxy:
accessLog: ""
additionalEnv: null
await: true
capabilities: null
control:
@ -1090,7 +1091,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
limits:
memory: "250Mi"
@ -1469,7 +1469,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
limits:
memory: "250Mi"
@ -1945,7 +1944,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
limits:
memory: "250Mi"

4
cli/cmd/testdata/install_no_init_container.golden generated vendored
View File

@ -636,6 +636,7 @@ data:
prometheusUrl: ""
proxy:
accessLog: ""
additionalEnv: null
await: true
capabilities: null
control:
@ -1050,7 +1051,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1381,7 +1381,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1811,7 +1810,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false

3
cli/cmd/testdata/install_output.golden generated vendored
View File

@ -616,6 +616,7 @@ data:
prometheusUrl: ""
proxy:
accessLog: ""
additionalEnv: null
await: true
capabilities: null
control: null
@ -1348,7 +1349,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
limits:
cpu: "cpu-limit"
@ -1788,7 +1788,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
limits:
cpu: "cpu-limit"

4
cli/cmd/testdata/install_proxy_ignores.golden generated vendored
View File

@ -636,6 +636,7 @@ data:
prometheusUrl: ""
proxy:
accessLog: ""
additionalEnv: null
await: true
capabilities: null
control:
@ -1050,7 +1051,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1387,7 +1387,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1823,7 +1822,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false

4
cli/cmd/testdata/install_values_file.golden generated vendored
View File

@ -636,6 +636,7 @@ data:
prometheusUrl: ""
proxy:
accessLog: ""
additionalEnv: null
await: true
capabilities: null
control:
@ -1050,7 +1051,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1387,7 +1387,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false
@ -1823,7 +1822,6 @@ spec:
port: 4191
initialDelaySeconds: 2
timeoutSeconds: 1
initialDelaySeconds: 2
resources:
securityContext:
allowPrivilegeEscalation: false

7
multicluster/charts/linkerd-multicluster-link/templates/service-mirror.yaml
View File

@ -139,10 +139,15 @@ spec:
{{- end }}
- -enable-pprof={{.Values.enablePprof | default false}}
- {{.Values.targetClusterName}}
{{- with .Values.serviceMirrorExperimentalEnv }}
{{- if or .Values.serviceMirrorAdditionalEnv .Values.serviceMirrorExperimentalEnv }}
env:
{{- with .Values.serviceMirrorAdditionalEnv }}
{{- toYaml . | nindent 8 -}}
{{- end }}
{{- with .Values.serviceMirrorExperimentalEnv }}
{{- toYaml . | nindent 8 -}}
{{- end }}
{{- end }}
image: {{.Values.controllerImage}}:{{.Values.controllerImageVersion}}
name: service-mirror
securityContext:

1
pkg/charts/linkerd2/values.go
View File

@ -125,6 +125,7 @@ type (
LivenessProbe *Probe `json:"livenessProbe"`
Control *ProxyControl `json:"control"`
AdditionalEnv []corev1.EnvVar `json:"additionalEnv"`
ExperimentalEnv []corev1.EnvVar `json:"experimentalEnv"`
}