From 9ac1caaf1becfc2a2a1480e7536ec407285f4ce4 Mon Sep 17 00:00:00 2001 From: Alejandro Pedraza Date: Thu, 15 Feb 2024 14:26:45 -0500 Subject: [PATCH] Add `additionalEnv` helm settings (#12080) Add `additionalEnv` helm settings to the proxy and controller manifests alongside the existing `experimentalEnv` ones. --- .../templates/destination.yaml | 14 ++++++++++++-- .../linkerd-control-plane/templates/heartbeat.yaml | 3 +++ .../linkerd-control-plane/templates/identity.yaml | 3 +++ .../templates/proxy-injector.yaml | 7 ++++++- charts/partials/templates/_proxy.tpl | 3 +++ .../install_controlplane_tracing_output.golden | 4 +--- cli/cmd/testdata/install_custom_domain.golden | 4 +--- cli/cmd/testdata/install_custom_registry.golden | 4 +--- cli/cmd/testdata/install_default.golden | 4 +--- .../install_default_override_dst_get_nets.golden | 4 +--- cli/cmd/testdata/install_default_token.golden | 4 +--- cli/cmd/testdata/install_ha_output.golden | 4 +--- .../install_ha_with_overrides_output.golden | 4 +--- .../install_heartbeat_disabled_output.golden | 4 +--- .../install_helm_control_plane_output.golden | 4 +--- .../install_helm_control_plane_output_ha.golden | 4 +--- .../testdata/install_helm_output_ha_labels.golden | 4 +--- ...nstall_helm_output_ha_namespace_selector.golden | 4 +--- cli/cmd/testdata/install_no_init_container.golden | 4 +--- cli/cmd/testdata/install_output.golden | 3 +-- cli/cmd/testdata/install_proxy_ignores.golden | 4 +--- cli/cmd/testdata/install_values_file.golden | 4 +--- .../templates/service-mirror.yaml | 7 ++++++- pkg/charts/linkerd2/values.go | 1 + 24 files changed, 51 insertions(+), 54 deletions(-) diff --git a/charts/linkerd-control-plane/templates/destination.yaml b/charts/linkerd-control-plane/templates/destination.yaml index 5be29aed3..fff98ef68 100644 --- a/charts/linkerd-control-plane/templates/destination.yaml +++ b/charts/linkerd-control-plane/templates/destination.yaml @@ -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: diff --git a/charts/linkerd-control-plane/templates/heartbeat.yaml b/charts/linkerd-control-plane/templates/heartbeat.yaml index 8b3d1e1b9..d96318786 100644 --- a/charts/linkerd-control-plane/templates/heartbeat.yaml +++ b/charts/linkerd-control-plane/templates/heartbeat.yaml @@ -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 }} diff --git a/charts/linkerd-control-plane/templates/identity.yaml b/charts/linkerd-control-plane/templates/identity.yaml index ae375f200..83532c53d 100644 --- a/charts/linkerd-control-plane/templates/identity.yaml +++ b/charts/linkerd-control-plane/templates/identity.yaml @@ -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 }} diff --git a/charts/linkerd-control-plane/templates/proxy-injector.yaml b/charts/linkerd-control-plane/templates/proxy-injector.yaml index 8837af9bd..d3038df73 100644 --- a/charts/linkerd-control-plane/templates/proxy-injector.yaml +++ b/charts/linkerd-control-plane/templates/proxy-injector.yaml @@ -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: diff --git a/charts/partials/templates/_proxy.tpl b/charts/partials/templates/_proxy.tpl index d48f476ea..1db5c8779 100644 --- a/charts/partials/templates/_proxy.tpl +++ b/charts/partials/templates/_proxy.tpl @@ -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 -}} diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index 09aa61c96..81bfa48ae 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -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 diff --git a/cli/cmd/testdata/install_custom_domain.golden b/cli/cmd/testdata/install_custom_domain.golden index aa1419beb..70d0537f7 100644 --- a/cli/cmd/testdata/install_custom_domain.golden +++ b/cli/cmd/testdata/install_custom_domain.golden @@ -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 diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden index bc976390d..5af4971ed 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -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 diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index aa1419beb..70d0537f7 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -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 diff --git a/cli/cmd/testdata/install_default_override_dst_get_nets.golden b/cli/cmd/testdata/install_default_override_dst_get_nets.golden index 102310549..d9aa52d57 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -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 diff --git a/cli/cmd/testdata/install_default_token.golden b/cli/cmd/testdata/install_default_token.golden index 660be38b5..29af9b70f 100644 --- a/cli/cmd/testdata/install_default_token.golden +++ b/cli/cmd/testdata/install_default_token.golden @@ -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 diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden index 017463aac..dd796905d 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -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" diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden index 41700a1ab..4344954b4 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -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" diff --git a/cli/cmd/testdata/install_heartbeat_disabled_output.golden b/cli/cmd/testdata/install_heartbeat_disabled_output.golden index e1a0e8902..000089bae 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -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 diff --git a/cli/cmd/testdata/install_helm_control_plane_output.golden b/cli/cmd/testdata/install_helm_control_plane_output.golden index f8e4238b6..5ec38201c 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output.golden @@ -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 diff --git a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden index b36f01cfa..28c32f2e0 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden @@ -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" diff --git a/cli/cmd/testdata/install_helm_output_ha_labels.golden b/cli/cmd/testdata/install_helm_output_ha_labels.golden index 6b5262f39..d6d4aa5b2 100644 --- a/cli/cmd/testdata/install_helm_output_ha_labels.golden +++ b/cli/cmd/testdata/install_helm_output_ha_labels.golden @@ -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" diff --git a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden index e74dcb070..39be13d24 100644 --- a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden +++ b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden @@ -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" diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden index a02ffb86f..c112e8a7d 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -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 diff --git a/cli/cmd/testdata/install_output.golden b/cli/cmd/testdata/install_output.golden index 99996d252..b3e78daba 100644 --- a/cli/cmd/testdata/install_output.golden +++ b/cli/cmd/testdata/install_output.golden @@ -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" diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index 1d56deb06..9465393ab 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -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 diff --git a/cli/cmd/testdata/install_values_file.golden b/cli/cmd/testdata/install_values_file.golden index e4d7b0ed9..9e4559ac2 100644 --- a/cli/cmd/testdata/install_values_file.golden +++ b/cli/cmd/testdata/install_values_file.golden @@ -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 diff --git a/multicluster/charts/linkerd-multicluster-link/templates/service-mirror.yaml b/multicluster/charts/linkerd-multicluster-link/templates/service-mirror.yaml index 55b4a5564..33ecc1b8d 100644 --- a/multicluster/charts/linkerd-multicluster-link/templates/service-mirror.yaml +++ b/multicluster/charts/linkerd-multicluster-link/templates/service-mirror.yaml @@ -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: diff --git a/pkg/charts/linkerd2/values.go b/pkg/charts/linkerd2/values.go index 001f91c21..d71bdb377 100644 --- a/pkg/charts/linkerd2/values.go +++ b/pkg/charts/linkerd2/values.go @@ -125,6 +125,7 @@ type ( LivenessProbe *Probe `json:"livenessProbe"` Control *ProxyControl `json:"control"` + AdditionalEnv []corev1.EnvVar `json:"additionalEnv"` ExperimentalEnv []corev1.EnvVar `json:"experimentalEnv"` }