linkerd · alpeb · Apr 23, 2020 · Apr 17, 2020 · Apr 17, 2020 · Apr 17, 2020
diff --git a/cli/cmd/install.go b/cli/cmd/install.go
@@ -511,10 +511,6 @@ func (options *installOptions) recordableFlagSet() *pflag.FlagSet {
 		"A path to a PEM-encoded file containing Linkerd Identity trust anchors (generated by default)",
 	)
 
-	flags.StringVar(
-		&options.addOnConfig, "addon-config", options.addOnConfig,
-		"A path to a configuration file of add-ons",
-	)
 	flags.BoolVar(
 		&options.smiMetricsEnabled, "smi-metrics", options.smiMetricsEnabled,
 		"Enables installing the SMI-Metrics controller",
@@ -545,6 +541,11 @@ func (options *installOptions) allStageFlagSet() *pflag.FlagSet {
 		"Restrict the Linkerd Dashboard's default privileges to disallow Tap and Check",
 	)
 
+	flags.StringVar(
+		&options.addOnConfig, "addon-config", options.addOnConfig,
+		"A path to a configuration file of add-ons",
+	)
+
 	return flags
 }
 
@@ -825,12 +826,36 @@ func render(w io.Writer, values *l5dcharts.Values) error {
 		{Name: chartutil.ChartfileName},
 	}
 
+	addOns, err := l5dcharts.ParseAddOnValues(values)
+	if err != nil {
+		return err
+	}
+
+	// Initialize add-on sub-charts
+	addOnCharts := make(map[string]*charts.Chart)
+	for _, addOn := range addOns {
+		addOnCharts[addOn.Name()] = &charts.Chart{
+			Name:      addOn.Name(),
+			Dir:       filepath.Join(addOnChartsPath, addOn.Name()),
+			Namespace: controlPlaneNamespace,
+			RawValues: append(rawValues, addOn.Values()...),
+			Files: []*chartutil.BufferedFile{&chartutil.BufferedFile{
+				Name: chartutil.ChartfileName,
+			}},
+		}
+	}
+
 	if values.Stage == "" || values.Stage == configStage {
 		for _, template := range templatesConfigStage {
 			files = append(files,
 				&chartutil.BufferedFile{Name: template},
 			)
 		}
+
+		// Fill add-on's sub-charts with config templates
+		for _, addOn := range addOns {
+			addOnCharts[addOn.Name()].Files = append(addOnCharts[addOn.Name()].Files, addOn.ConfigStageTemplates()...)
+		}
 	}
 
 	if values.Stage == "" || values.Stage == controlPlaneStage {
@@ -840,6 +865,12 @@ func render(w io.Writer, values *l5dcharts.Values) error {
 				&chartutil.BufferedFile{Name: template},
 			)
 		}
+
+		// Fill add-on's sub-charts with control-plane templates
+		for _, addOn := range addOns {
+			addOnCharts[addOn.Name()].Files = append(addOnCharts[addOn.Name()].Files, addOn.ControlPlaneStageTemplates()...)
+		}
+
 	}
 
 	// TODO refactor to use l5dcharts.LoadChart()
@@ -855,29 +886,14 @@ func render(w io.Writer, values *l5dcharts.Values) error {
 		return err
 	}
 
-	if values.Stage != configStage {
-		addons, err := l5dcharts.ParseAddOnValues(values)
+	for _, addon := range addOns {
+		b, err := addOnCharts[addon.Name()].Render()
 		if err != nil {
 			return err
 		}
 
-		for _, addon := range addons {
-			chart := &charts.Chart{
-				Name:      addon.Name(),
-				Dir:       filepath.Join(addOnChartsPath, addon.Name()),
-				Namespace: controlPlaneNamespace,
-				RawValues: append(rawValues, addon.Values()...),
-				Files:     addon.Templates(),
-			}
-
-			b, err := chart.Render()
-			if err != nil {
-				return err
-			}
-
-			if _, err := buf.WriteString(b.String()); err != nil {
-				return err
-			}
+		if _, err := buf.WriteString(b.String()); err != nil {
+			return err
 		}
 	}
 

diff --git a/cli/cmd/install_helm_test.go b/cli/cmd/install_helm_test.go
@@ -225,12 +225,10 @@ func buildAddOnChart(t *testing.T, addon l5dcharts.AddOn, chartPartials *pb.Char
 		},
 	}
 
-	for _, filepath := range addon.Templates() {
-		if filepath.Name != chartutil.ChartfileName {
-			addOnChart.Templates = append(addOnChart.Templates, &pb.Template{
-				Name: filepath.Name,
-			})
-		}
+	for _, filepath := range append(addon.ConfigStageTemplates(), addon.ControlPlaneStageTemplates()...) {
+		addOnChart.Templates = append(addOnChart.Templates, &pb.Template{
+			Name: filepath.Name,
+		})
 	}
 
 	for _, template := range addOnChart.Templates {

diff --git a/cli/cmd/install_test.go b/cli/cmd/install_test.go
@@ -217,6 +217,22 @@ func TestRender(t *testing.T) {
 	withCustomRegistryValues, _, _ := withCustomRegistryOptions.validateAndBuild("", nil)
 	addFakeTLSSecrets(withCustomRegistryValues)
 
+	withAddOnConfigStage, err := testInstallOptions()
+	if err != nil {
+		t.Fatalf("Unexpected error: %v\n", err)
+	}
+	withAddOnConfigStageValues, _, _ := withAddOnConfigStage.validateAndBuild(configStage, nil)
+	withAddOnConfigStageValues.Tracing["enabled"] = true
+	addFakeTLSSecrets(withAddOnConfigStageValues)
+
+	withAddOnControlPlaneStage, err := testInstallOptions()
+	if err != nil {
+		t.Fatalf("Unexpected error: %v\n", err)
+	}
+	withAddOnControlPlaneStageValues, _, _ := withAddOnControlPlaneStage.validateAndBuild(controlPlaneStage, nil)
+	withAddOnControlPlaneStageValues.Tracing["enabled"] = true
+	addFakeTLSSecrets(withAddOnControlPlaneStageValues)
+
 	testCases := []struct {
 		values         *charts.Values
 		goldenFileName string
@@ -233,6 +249,8 @@ func TestRender(t *testing.T) {
 		{withRestrictedDashboardPriviligesValues, "install_restricted_dashboard.golden"},
 		{withControlPlaneTracingValues, "install_controlplane_tracing_output.golden"},
 		{withCustomRegistryValues, "install_custom_registry.golden"},
+		{withAddOnConfigStageValues, "install_addon_config.golden"},
+		{withAddOnControlPlaneStageValues, "install_addon_control-plane.golden"},
 	}
 
 	for i, tc := range testCases {

diff --git a/cli/cmd/testdata/addon_config.yaml b/cli/cmd/testdata/addon_config.yaml
@@ -0,0 +1,2 @@
+tracing:
+    enabled: true
diff --git a/cli/cmd/testdata/addon_config_overwrite.yaml b/cli/cmd/testdata/addon_config_overwrite.yaml
@@ -0,0 +1,5 @@
+tracing:
+  enabled: true
+  collector:
+    name: overwrite-collector
+    image: overwrite-collector-image