Get data from kustomize output rather than kustomization.yaml

Author: liam-mackie

pkg/plugins/optional/helm/v2alpha/edit.go

@@ -37,8 +37,6 @@ const (
 	DefaultManifestsFile = "dist/install.yaml"
 	// DefaultOutputDir is the default output directory for Helm charts
 	DefaultOutputDir = "dist"
-	// DefaultKustomizeFile is the default path for kustomization.yaml
-	DefaultKustomizeFile = "config/default/kustomization.yaml"
 )
 
 var _ plugin.EditSubcommand = &editSubcommand{}
@@ -48,7 +46,6 @@ type editSubcommand struct {
 	force         bool
 	manifestsFile string
 	outputDir     string
-	kustomizePath string
 }
 
 //nolint:lll
@@ -101,8 +98,6 @@ func (p *editSubcommand) BindFlags(fs *pflag.FlagSet) {
 	fs.BoolVar(&p.force, "force", false, "if true, regenerates all the files")
 	fs.StringVar(&p.manifestsFile, "manifests", DefaultManifestsFile,
 		"path to the YAML file containing Kubernetes manifests from kustomize output")
-	fs.StringVar(&p.kustomizePath, "kustomize-path", DefaultKustomizeFile,
-		"path to the kustomization.yaml file used to generate the manifests file")
 	fs.StringVar(&p.outputDir, "output-dir", DefaultOutputDir, "output directory for the generated Helm chart")
 }
 
@@ -119,7 +114,7 @@ func (p *editSubcommand) Scaffold(fs machinery.Filesystem) error {
 		}
 	}
 
-	scaffolder := scaffolds.NewKustomizeHelmScaffolder(p.config, p.force, p.manifestsFile, p.outputDir, p.kustomizePath)
+	scaffolder := scaffolds.NewKustomizeHelmScaffolder(p.config, p.force, p.manifestsFile, p.outputDir)
 	scaffolder.InjectFS(fs)
 	err := scaffolder.Scaffold()
 	if err != nil {

pkg/plugins/optional/helm/v2alpha/scaffolds/edit_kustomize.go

@@ -45,19 +45,15 @@ type editKustomizeScaffolder struct {
 	force         bool
 	manifestsFile string
 	outputDir     string
-	kustomizeFile string
 }
 
 // NewKustomizeHelmScaffolder returns a new Scaffolder for HelmPlugin using kustomize output
-func NewKustomizeHelmScaffolder(
-	cfg config.Config, force bool, manifestsFile, outputDir, kustomizeFile string,
-) plugins.Scaffolder {
+func NewKustomizeHelmScaffolder(cfg config.Config, force bool, manifestsFile, outputDir string) plugins.Scaffolder {
 	return &editKustomizeScaffolder{
 		config:        cfg,
 		force:         force,
 		manifestsFile: manifestsFile,
 		outputDir:     outputDir,
-		kustomizeFile: kustomizeFile,
 	}
 }
 
@@ -113,17 +109,7 @@ func (s *editKustomizeScaffolder) Scaffold() error {
 			slog.Warn("failed to remove stale generic ServiceMonitor", "path", staleSM, "error", rmErr)
 		}
 	}
-
-	// Read namePrefix from kustomization.yaml
-	// falls back to project name if not found/configured
-	namePrefix := kustomize.ReadNamePrefix(s.kustomizeFile)
-	if namePrefix == "" {
-		namePrefix = s.config.GetProjectName()
-	} else {
-		// Remove trailing dash if present
-		namePrefix = strings.TrimSuffix(namePrefix, "-")
-	}
-
+	namePrefix := resources.EstimatePrefix(s.config.GetProjectName())
 	chartConverter := kustomize.NewChartConverter(resources, s.config.GetProjectName(), namePrefix, s.outputDir)
 	deploymentConfig := chartConverter.ExtractDeploymentConfig()
 

pkg/plugins/optional/helm/v2alpha/scaffolds/internal/kustomize/parser.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"strings"
 
 	"gopkg.in/yaml.v3"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -152,21 +153,25 @@ func (p *Parser) categorizeResource(obj *unstructured.Unstructured, resources *P
 	}
 }
 
-// ReadNamePrefix reads the namePrefix from a kustomization.yaml file
-// Returns empty string if the file doesn't exist or has no namePrefix
-func ReadNamePrefix(kustomizationPath string) string {
-	data, err := os.ReadFile(kustomizationPath)
-	if err != nil {
-		return ""
-	}
-
-	var kustomization struct {
-		NamePrefix string `yaml:"namePrefix"`
+func (pr *ParsedResources) EstimatePrefix(projectName string) string {
+	prefix := projectName
+	if pr.Deployment != nil {
+		if name := pr.Deployment.GetName(); name != "" {
+			deploymentPrefix, found := strings.CutSuffix(projectName, "-controller-manager")
+			if found {
+				prefix = deploymentPrefix
+			}
+		}
 	}
-
-	if err := yaml.Unmarshal(data, &kustomization); err != nil {
-		return ""
+	// Double check that the prefix is also the prefix for the service names
+	for _, svc := range pr.Services {
+		if name := svc.GetName(); name != "" {
+			if !strings.HasPrefix(name, prefix) {
+				// If not, fallback to just project name
+				prefix = projectName
+				break
+			}
+		}
 	}
-
-	return kustomization.NamePrefix
+	return prefix
 }