readded builder value parser

Author: NoaheCampbell

cli/cmd/lint.go

@@ -385,6 +385,8 @@ func (r *runners) lintPreflightSpecs(cmd *cobra.Command, preflights []lint2.Pref
 			cmd.Context(),
 			pf.SpecPath,
 			pf.ValuesPath,
+			pf.ChartName,
+			pf.ChartVersion,
 			helmChartManifests,
 			preflightVersion,
 		)

examples/support-bundles/helmchart-sample-app.yaml

@@ -6,5 +6,12 @@ spec:
   chart:
     name: sample-app
     chartVersion: 1.0.0
-  # Optional builder values that can be used by v1beta3 preflights
-  builder: {}
+  # Builder values override chart values for v1beta3 preflights
+  builder:
+    testMode: true
+    environment: production
+    replicas: 3
+    database:
+      enabled: true
+      host: db.example.com
+      port: 5432

pkg/lint2/config.go

@@ -2,6 +2,7 @@ package lint2
 
 import (
 	"fmt"
+	"path/filepath"
 
 	"github.com/replicatedhq/replicated/pkg/tools"
 )
@@ -88,8 +89,8 @@ func GetPreflightPathsFromConfig(config *tools.Config) ([]string, error) {
 type PreflightWithValues struct {
 	SpecPath     string // Path to the preflight spec file
 	ValuesPath   string // Path to values.yaml (optional - passed to preflight lint if provided)
-	ChartName    string // Deprecated: no longer used
-	ChartVersion string // Deprecated: no longer used
+	ChartName    string // Chart name from Chart.yaml (used to look up HelmChart manifest for builder values)
+	ChartVersion string // Chart version from Chart.yaml (used to look up HelmChart manifest for builder values)
 }
 
 // GetPreflightWithValuesFromConfig extracts preflight paths with associated chart/values information
@@ -117,6 +118,24 @@ func GetPreflightWithValuesFromConfig(config *tools.Config) ([]PreflightWithValu
 				ValuesPath: preflightConfig.ValuesPath, // Optional - can be empty
 			}
 
+			// Extract chart metadata if valuesPath is provided
+			// This is needed to look up the matching HelmChart manifest for builder values
+			if preflightConfig.ValuesPath != "" {
+				// Get the chart directory from the values path
+				// valuesPath is expected to be like "./helm-chart/values.yaml"
+				chartDir := filepath.Dir(preflightConfig.ValuesPath)
+
+				chartMetadata, err := GetChartMetadata(chartDir)
+				if err != nil {
+					// If we can't read Chart.yaml, it's OK - builder values just won't be applied
+					// This allows preflights without associated charts to work
+					// Don't fail the whole operation, just skip this preflight's metadata
+				} else {
+					result.ChartName = chartMetadata.Name
+					result.ChartVersion = chartMetadata.Version
+				}
+			}
+
 			results = append(results, result)
 		}
 	}

pkg/lint2/preflight.go

@@ -11,6 +11,7 @@ import (
 	"strings"
 
 	"github.com/replicatedhq/replicated/pkg/tools"
+	"gopkg.in/yaml.v3"
 )
 
 // PreflightLintResult represents the JSON output from preflight lint
@@ -34,11 +35,13 @@ type PreflightLintIssue struct {
 
 // LintPreflight executes preflight lint on the given spec path and returns structured results.
 // The preflight CLI tool handles template rendering and validation internally.
-// For v1beta3 specs, we validate that HelmChart manifests exist before linting.
+// For v1beta3 specs, we validate that HelmChart manifests exist and extract builder values.
 func LintPreflight(
 	ctx context.Context,
 	specPath string,
 	valuesPath string,
+	chartName string,
+	chartVersion string,
 	helmChartManifests map[string]*HelmChartManifest,
 	preflightVersion string,
 ) (*LintResult, error) {
@@ -72,11 +75,43 @@ func LintPreflight(
 	// Build command arguments
 	args := []string{"lint", "--format", "json"}
 
-	// Add values file if provided
+	// Add chart values file if provided from config
 	if valuesPath != "" {
 		args = append(args, "--values", valuesPath)
 	}
 
+	// Extract and add builder values if HelmChart manifest exists
+	var builderValuesPath string
+	if chartName != "" && chartVersion != "" {
+		key := fmt.Sprintf("%s:%s", chartName, chartVersion)
+		if helmChart, found := helmChartManifests[key]; found && helmChart.BuilderValues != nil {
+			// Create temp file for builder values
+			builderFile, err := os.CreateTemp("", "replicated-builder-*.yaml")
+			if err != nil {
+				return nil, fmt.Errorf("failed to create temp file for builder values: %w", err)
+			}
+			builderValuesPath = builderFile.Name()
+			defer func() {
+				if err := os.Remove(builderValuesPath); err != nil && !os.IsNotExist(err) {
+					fmt.Fprintf(os.Stderr, "Warning: failed to cleanup builder values temp file %s: %v\n", builderValuesPath, err)
+				}
+			}()
+
+			// Write builder values as YAML
+			builderYAML, err := yaml.Marshal(helmChart.BuilderValues)
+			if err != nil {
+				return nil, fmt.Errorf("failed to marshal builder values: %w", err)
+			}
+			if _, err := builderFile.Write(builderYAML); err != nil {
+				return nil, fmt.Errorf("failed to write builder values: %w", err)
+			}
+			builderFile.Close()
+
+			// Add builder values to command
+			args = append(args, "--values", builderValuesPath)
+		}
+	}
+
 	args = append(args, specPath)
 
 	// Execute preflight lint