Revert "refactor(helm): Replace VFS with embed for Helm chart rendering (#14206)"

This reverts commit 4125bd8.

Author: adleong

.gitignore

@@ -12,6 +12,7 @@ web/app/js/locales/_build
 web/app/js/locales/**/*.js
 web/app/yarn-error.log
 vendor
+**/*.gogen*
 **/*.swp
 **/charts/**/charts
 package-lock.json

bin/build-cli-bin

@@ -17,7 +17,12 @@ rootdir=$( cd "$bindir"/.. && pwd )
     cd "$rootdir"
     cd "$(pwd -P)"
     target=target/cli/$(os)/linkerd
-
+     # TODO: `go generate` does not honor -mod=readonly
+    GO111MODULE=on go generate -mod=readonly ./pkg/charts/static
+    GO111MODULE=on go generate -mod=readonly ./jaeger/static
+    GO111MODULE=on go generate -mod=readonly ./multicluster/static
+    GO111MODULE=on go generate -mod=readonly ./viz/static
+    
     root_tag=$("$bindir"/root-tag)
     GO111MODULE=on CGO_ENABLED=0 go build -o "$target" -tags prod -mod=readonly -ldflags "-s -w -X github.com/linkerd/linkerd2/pkg/version.Version=$root_tag" ./cli
     echo "$target"

charts/templates.go

@@ -22,6 +22,13 @@ COPY controller/api controller/api
 COPY controller/gen controller/gen
 COPY pkg pkg
 
+# Generate static templates
+# TODO: `go generate` does not honor -mod=readonly
+RUN go generate -mod=readonly ./pkg/charts/static
+RUN go generate -mod=readonly ./jaeger/static
+RUN go generate -mod=readonly ./multicluster/static
+RUN go generate -mod=readonly ./viz/static
+
 RUN mkdir -p /out
 
 FROM go-gen AS linux-amd64-full

cli/Dockerfile

@@ -6,9 +6,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/linkerd/linkerd2/charts"
-	chartspkg "github.com/linkerd/linkerd2/pkg/charts"
+	"github.com/linkerd/linkerd2/pkg/charts"
 	cnicharts "github.com/linkerd/linkerd2/pkg/charts/cni"
+	"github.com/linkerd/linkerd2/pkg/charts/static"
 	"github.com/linkerd/linkerd2/pkg/cmd"
 	"github.com/linkerd/linkerd2/pkg/flags"
 	"github.com/linkerd/linkerd2/pkg/version"
@@ -249,13 +249,13 @@ func renderCNIPlugin(w io.Writer, valOpts values.Options, config *cniPluginOptio
 		{Name: "templates/cni-plugin.yaml"},
 	}
 
-	ch := &chartspkg.Chart{
+	ch := &charts.Chart{
 		Name:      helmCNIDefaultChartName,
 		Dir:       helmCNIDefaultChartDir,
 		Namespace: defaultCNINamespace,
 		Values:    mergedValues,
 		Files:     files,
-		Fs:        charts.Templates,
+		Fs:        static.Templates,
 	}
 
 	buf, err := ch.RenderCNI()

cli/cmd/install-cni-plugin.go

@@ -13,10 +13,10 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/linkerd/linkerd2/charts"
 	"github.com/linkerd/linkerd2/cli/flag"
-	chartspkg "github.com/linkerd/linkerd2/pkg/charts"
+	"github.com/linkerd/linkerd2/pkg/charts"
 	l5dcharts "github.com/linkerd/linkerd2/pkg/charts/linkerd2"
+	"github.com/linkerd/linkerd2/pkg/charts/static"
 	pkgcmd "github.com/linkerd/linkerd2/pkg/cmd"
 	flagspkg "github.com/linkerd/linkerd2/pkg/flags"
 	"github.com/linkerd/linkerd2/pkg/healthcheck"
@@ -331,11 +331,14 @@ func isRunAsRoot(values map[string]interface{}) bool {
 // them into a buffer. The coalesced values are also returned so that they may be rendered via
 // `renderOverrides` if appropriate.
 func renderChartToBuffer(files []*loader.BufferedFile, values map[string]interface{}, valuesOverrides map[string]interface{}) (*bytes.Buffer, chartutil.Values, error) {
-	partials, err := chartspkg.LoadPartials()
-	if err != nil {
+	// Load the partials in addition to the main chart.
+	var partials []*loader.BufferedFile
+	for _, template := range charts.L5dPartials {
+		partials = append(partials, &loader.BufferedFile{Name: template})
+	}
+	if err := charts.FilesReader(static.Templates, "", partials); err != nil {
 		return nil, nil, err
 	}
-
 	chart, err := loader.LoadFiles(append(files, partials...))
 	if err != nil {
 		return nil, nil, err
@@ -432,13 +435,13 @@ func renderCRDs(ctx context.Context, k *k8s.KubernetesAPI, w io.Writer, options
 	for _, template := range TemplatesCrdFiles {
 		files = append(files, &loader.BufferedFile{Name: template})
 	}
-	if err := chartspkg.FilesReader(charts.Templates, l5dcharts.HelmChartDirCrds+"/", files); err != nil {
+	if err := charts.FilesReader(static.Templates, l5dcharts.HelmChartDirCrds+"/", files); err != nil {
 		return err
 	}
 
 	// Load defaults from values.yaml
 	valuesFile := &loader.BufferedFile{Name: l5dcharts.HelmChartDirCrds + "/values.yaml"}
-	if err := chartspkg.ReadFile(charts.Templates, "", valuesFile); err != nil {
+	if err := charts.ReadFile(static.Templates, "/", valuesFile); err != nil {
 		return err
 	}
 	// Ensure the map is not nil, even if the default `values.yaml` is empty ---
@@ -467,7 +470,7 @@ func renderCRDs(ctx context.Context, k *k8s.KubernetesAPI, w io.Writer, options
 		}
 
 		defaultValues = updateDefaultValues(installed, defaultValues)
-		finalValues := chartspkg.MergeMaps(defaultValues, valuesOverrides)
+		finalValues := charts.MergeMaps(defaultValues, valuesOverrides)
 
 		if err := validateFinalValues(installed, finalValues); err != nil {
 			return err
@@ -489,7 +492,7 @@ func renderControlPlane(w io.Writer, values *l5dcharts.Values, valuesOverrides m
 	for _, template := range TemplatesControlPlane {
 		files = append(files, &loader.BufferedFile{Name: template})
 	}
-	if err := chartspkg.FilesReader(charts.Templates, l5dcharts.HelmChartDirCP+"/", files); err != nil {
+	if err := charts.FilesReader(static.Templates, l5dcharts.HelmChartDirCP+"/", files); err != nil {
 		return err
 	}
 

cli/cmd/install.go

@@ -5,9 +5,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/linkerd/linkerd2/charts"
-	chartspkg "github.com/linkerd/linkerd2/pkg/charts"
+	"github.com/linkerd/linkerd2/pkg/charts"
 	l5dcharts "github.com/linkerd/linkerd2/pkg/charts/linkerd2"
+	"github.com/linkerd/linkerd2/pkg/charts/static"
 	"github.com/linkerd/linkerd2/pkg/k8s"
 	"github.com/linkerd/linkerd2/testutil"
 	"helm.sh/helm/v3/pkg/chart"
@@ -227,7 +227,7 @@ func chartCrds(t *testing.T) *chart.Chart {
 
 	// Load defaults from values.yaml
 	valuesFile := &loader.BufferedFile{Name: l5dcharts.HelmChartDirCrds + "/values.yaml"}
-	if err := chartspkg.ReadFile(charts.Templates, "", valuesFile); err != nil {
+	if err := charts.ReadFile(static.Templates, "/", valuesFile); err != nil {
 		t.Fatal(err)
 	}
 	defaultValues := make(map[string]interface{})

cli/cmd/install_helm_test.go

@@ -14,12 +14,14 @@ FROM go-deps AS golang
 WORKDIR /linkerd-build
 COPY controller/gen controller/gen
 COPY pkg pkg
-COPY charts charts
 COPY controller controller
 COPY charts/patch charts/patch
 COPY charts/partials charts/partials
 COPY multicluster multicluster
 
+# Generate static templates
+# TODO: `go generate` does not honor -mod=readonly
+RUN go generate -mod=readonly ./pkg/charts/static
 ARG TARGETARCH
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -o /out/controller -tags prod -mod=readonly -ldflags "-s -w" ./controller/cmd
 

controller/Dockerfile

@@ -8,8 +8,9 @@ import (
 	"path"
 	"time"
 
-	"github.com/linkerd/linkerd2/jaeger/charts"
-	chartspkg "github.com/linkerd/linkerd2/pkg/charts"
+	"github.com/linkerd/linkerd2/jaeger/static"
+	"github.com/linkerd/linkerd2/pkg/charts"
+	partials "github.com/linkerd/linkerd2/pkg/charts/static"
 	pkgcmd "github.com/linkerd/linkerd2/pkg/cmd"
 	"github.com/linkerd/linkerd2/pkg/flags"
 	"github.com/linkerd/linkerd2/pkg/healthcheck"
@@ -125,13 +126,20 @@ func render(w io.Writer, valuesOverrides map[string]interface{}, registry string
 		)
 	}
 
+	var partialFiles []*loader.BufferedFile
+	for _, template := range charts.L5dPartials {
+		partialFiles = append(partialFiles,
+			&loader.BufferedFile{Name: template},
+		)
+	}
+
 	// Load all jaeger chart files into buffer
-	if err := chartspkg.FilesReader(charts.Templates, "linkerd-jaeger/", files); err != nil {
+	if err := charts.FilesReader(static.Templates, "linkerd-jaeger/", files); err != nil {
 		return err
 	}
 
-	partialFiles, err := chartspkg.LoadPartials()
-	if err != nil {
+	// Load all partial chart files into buffer
+	if err := charts.FilesReader(partials.Templates, "", partialFiles); err != nil {
 		return err
 	}
 
@@ -146,7 +154,7 @@ func render(w io.Writer, valuesOverrides map[string]interface{}, registry string
 		return err
 	}
 
-	vals, err = chartspkg.InsertVersionValues(vals)
+	vals, err = charts.InsertVersionValues(vals)
 	if err != nil {
 		return err
 	}