helm: Add experimentalEnv settings

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]>
linkerd · Jan 10, 2024 · ea2ffa6 · ea2ffa6
1 parent 5e32446
commit ea2ffa6
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 17 deletions.
diff --git a/charts/linkerd-control-plane/templates/destination.yaml b/charts/linkerd-control-plane/templates/destination.yaml
@@ -208,6 +208,10 @@ spec:
         {{- range (.Values.destinationController).experimentalArgs }}
         - {{ . }}
         {{- end }}
+        {{- with (.Values.destinationController).experimentalEnv }}
+        env:
+        {{- toYaml . | nindent 8 -}}
+        {{- end }}
         {{- include "partials.linkerd.trace" . | nindent 8 -}}
         image: {{.Values.controllerImage}}:{{.Values.controllerImageVersion | default .Values.linkerdVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
@@ -245,6 +249,10 @@ spec:
         - -log-level={{.Values.controllerLogLevel}}
         - -log-format={{.Values.controllerLogFormat}}
         - -enable-pprof={{.Values.enablePprof | default false}}
+        {{- with (.Values.spValidator).experimentalEnv }}
+        env:
+        {{- toYaml . | nindent 8 -}}
+        {{- 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
@@ -59,6 +59,9 @@ spec:
             env:
             - name: LINKERD_DISABLED
               value: "the heartbeat controller does not use the proxy"
+            {{- with (.Values.heartbeat).experimentalEnv }}
+            {{- toYaml . | nindent 12 -}}
+            {{- end }}
             args:
             - "heartbeat"
             - "-controller-namespace={{.Release.Namespace}}"

diff --git 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).experimentalEnv }}
+        {{- toYaml . | nindent 8 -}}
+        {{- end }}
         image: {{.Values.controllerImage}}:{{.Values.controllerImageVersion | default .Values.linkerdVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         livenessProbe:

diff --git a/charts/linkerd-control-plane/templates/proxy-injector.yaml b/charts/linkerd-control-plane/templates/proxy-injector.yaml
@@ -79,6 +79,10 @@ spec:
         - -log-format={{.Values.controllerLogFormat}}
         - -linkerd-namespace={{.Release.Namespace}}
         - -enable-pprof={{.Values.enablePprof | default false}}
+        {{- with (.Values.proxyInjector).experimentalEnv }}
+        env:
+        {{- toYaml . | nindent 8 -}}
+        {{- end }}
         image: {{.Values.controllerImage}}:{{.Values.controllerImageVersion | default .Values.linkerdVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         livenessProbe:

diff --git a/cli/cmd/install.go b/cli/cmd/install.go
@@ -58,7 +58,7 @@ var (
 		"templates/workload/external-workload.yaml",
 	}
 
-	templatesControlPlane = []string{
+	TemplatesControlPlane = []string{
 		"templates/namespace.yaml",
 		"templates/identity-rbac.yaml",
 		"templates/destination-rbac.yaml",
@@ -364,7 +364,7 @@ func renderControlPlane(w io.Writer, values *l5dcharts.Values, valuesOverrides m
 	files := []*loader.BufferedFile{
 		{Name: chartutil.ChartfileName},
 	}
-	for _, template := range templatesControlPlane {
+	for _, template := range TemplatesControlPlane {
 		files = append(files, &loader.BufferedFile{Name: template})
 	}
 	if err := charts.FilesReader(static.Templates, l5dcharts.HelmChartDirCP+"/", files); err != nil {

diff --git a/cli/cmd/install_helm_test.go b/cli/cmd/install_helm_test.go
@@ -287,7 +287,7 @@ func chartControlPlane(t *testing.T, ha bool, additionalConfig string, ignoreOut
 
 	linkerd2Chart.AddDependency(chartPartials)
 
-	for _, filepath := range templatesControlPlane {
+	for _, filepath := range TemplatesControlPlane {
 		linkerd2Chart.Templates = append(linkerd2Chart.Templates, &chart.File{
 			Name: filepath,
 		})

diff --git a/multicluster/charts/linkerd-multicluster-link/templates/service-mirror.yaml b/multicluster/charts/linkerd-multicluster-link/templates/service-mirror.yaml
@@ -139,6 +139,10 @@ spec:
         {{- end }}
         - -enable-pprof={{.Values.enablePprof | default false}}
         - {{.Values.targetClusterName}}
+        {{- with .Values.serviceMirrorExperimentalEnv }}
+        env:
+        {{- toYaml . | nindent 8 -}}
+        {{- end }}
         image: {{.Values.controllerImage}}:{{.Values.controllerImageVersion}}
         name: service-mirror
         securityContext:

diff --git a/multicluster/cmd/install.go b/multicluster/cmd/install.go
@@ -34,6 +34,18 @@ type (
 	}
 )
 
+var TemplatesMulticluster = []*loader.BufferedFile{
+	{Name: chartutil.ChartfileName},
+	{Name: chartutil.ValuesfileName},
+	{Name: "templates/namespace.yaml"},
+	{Name: "templates/gateway.yaml"},
+	{Name: "templates/gateway-policy.yaml"},
+	{Name: "templates/psp.yaml"},
+	{Name: "templates/remote-access-service-mirror-rbac.yaml"},
+	{Name: "templates/link-crd.yaml"},
+	{Name: "templates/service-mirror-policy.yaml"},
+}
+
 func newMulticlusterInstallCommand() *cobra.Command {
 	options, err := newMulticlusterInstallOptionsWithDefault()
 	var ha bool
@@ -129,18 +141,6 @@ func install(ctx context.Context, w io.Writer, options *multiclusterInstallOptio
 }
 
 func render(w io.Writer, values *multicluster.Values, valuesOverrides map[string]interface{}) error {
-	files := []*loader.BufferedFile{
-		{Name: chartutil.ChartfileName},
-		{Name: chartutil.ValuesfileName},
-		{Name: "templates/namespace.yaml"},
-		{Name: "templates/gateway.yaml"},
-		{Name: "templates/gateway-policy.yaml"},
-		{Name: "templates/psp.yaml"},
-		{Name: "templates/remote-access-service-mirror-rbac.yaml"},
-		{Name: "templates/link-crd.yaml"},
-		{Name: "templates/service-mirror-policy.yaml"},
-	}
-
 	var partialFiles []*loader.BufferedFile
 	for _, template := range charts.L5dPartials {
 		partialFiles = append(partialFiles,
@@ -149,7 +149,7 @@ func render(w io.Writer, values *multicluster.Values, valuesOverrides map[string
 	}
 
 	// Load all multicluster install chart files into buffer
-	if err := charts.FilesReader(static.Templates, helmMulticlusterDefaultChartName+"/", files); err != nil {
+	if err := charts.FilesReader(static.Templates, helmMulticlusterDefaultChartName+"/", TemplatesMulticluster); err != nil {
 		return err
 	}
 
@@ -159,7 +159,7 @@ func render(w io.Writer, values *multicluster.Values, valuesOverrides map[string
 	}
 
 	// Create a Chart obj from the files
-	chart, err := loader.LoadFiles(append(files, partialFiles...))
+	chart, err := loader.LoadFiles(append(TemplatesMulticluster, partialFiles...))
 	if err != nil {
 		return err
 	}