Simply don't update service monitor name

Author: liam-mackie

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

@@ -110,7 +110,7 @@ func (s *editKustomizeScaffolder) Scaffold() error {
 		}
 	}
 	namePrefix := resources.EstimatePrefix(s.config.GetProjectName())
-	chartConverter := kustomize.NewChartConverter(resources, s.config.GetProjectName(), namePrefix, s.outputDir)
+	chartConverter := kustomize.NewChartConverter(resources, s.config.GetProjectName(), s.outputDir)
 	deploymentConfig := chartConverter.ExtractDeploymentConfig()
 
 	// Create scaffold for standard Helm chart files

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

@@ -37,9 +37,9 @@ type ChartConverter struct {
 }
 
 // NewChartConverter creates a new chart converter with all necessary components
-func NewChartConverter(resources *ParsedResources, projectName, namePrefix, outputDir string) *ChartConverter {
+func NewChartConverter(resources *ParsedResources, projectName, outputDir string) *ChartConverter {
 	organizer := NewResourceOrganizer(resources)
-	templater := NewHelmTemplater(projectName, namePrefix)
+	templater := NewHelmTemplater(projectName)
 	writer := NewChartWriter(templater, outputDir)
 
 	return &ChartConverter{

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

@@ -55,7 +55,7 @@ var _ = Describe("ChartConverter", func() {
 		fs = machinery.Filesystem{FS: afero.NewMemMapFs()}
 
 		// Create converter
-		converter = NewChartConverter(resources, "test-project", "test-project", "dist")
+		converter = NewChartConverter(resources, "test-project", "dist")
 	})
 
 	Context("NewChartConverter", func() {

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

@@ -145,7 +145,7 @@ func (w *ChartWriter) generateFileName(resource *unstructured.Unstructured, inde
 	// Try to use the resource name if available
 	if name := resource.GetName(); name != "" {
 		// Remove project prefix from the filename for cleaner file names
-		projectPrefix := w.templater.namePrefix + "-"
+		projectPrefix := w.templater.projectName + "-"
 		fileName := name
 		if strings.HasPrefix(name, projectPrefix) {
 			fileName = strings.TrimPrefix(name, projectPrefix)

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

@@ -48,14 +48,12 @@ const (
 // HelmTemplater handles converting YAML content to Helm templates
 type HelmTemplater struct {
 	projectName string
-	namePrefix  string
 }
 
 // NewHelmTemplater creates a new Helm templater
-func NewHelmTemplater(projectName string, namePrefix string) *HelmTemplater {
+func NewHelmTemplater(projectName string) *HelmTemplater {
 	return &HelmTemplater{
 		projectName: projectName,
-		namePrefix:  namePrefix,
 	}
 }
 
@@ -70,9 +68,6 @@ func (t *HelmTemplater) ApplyHelmSubstitutions(yamlContent string, resource *uns
 	// Apply namespace substitutions
 	yamlContent = t.substituteNamespace(yamlContent, resource)
 
-	// Template ServiceMonitor metadata.name to be chart.name-scoped for consistency
-	yamlContent = t.templateServiceMonitorNames(yamlContent, resource)
-
 	// Apply cert-manager and webhook-specific templating AFTER other substitutions
 	yamlContent = t.substituteCertManagerReferences(yamlContent, resource)
 
@@ -161,52 +156,6 @@ func (t *HelmTemplater) substituteCertManagerReferences(yamlContent string, _ *u
 	return yamlContent
 }
 
-// templateServiceNames ensures Service metadata.name uses Helm helpers for release-scoped naming.
-// It converts hardcoded names like "<project>-webhook-service" or
-// "<project>-controller-manager-metrics-service" to:
-//
-//	name: {{ include "chart.serviceName" (dict "suffix" "<suffix>" "context" .) }}
-// NOTE: Service names are intentionally left as project-scoped (no release prefix)
-// to match existing samples and e2e tests that refer to fixed service names.
-
-// templateServiceMonitorNames ensures ServiceMonitor metadata.name uses chart.name-based naming for consistency
-// with existing tests and samples. It converts names like "controller-manager-metrics-monitor" or
-// "<project>-controller-manager-metrics-monitor" to:
-//
-//	name: {{ include "chart.name" . }}-controller-manager-metrics-monitor
-func (t *HelmTemplater) templateServiceMonitorNames(yamlContent string, resource *unstructured.Unstructured) string {
-	if resource.GetKind() != kindServiceMonitor {
-		return yamlContent
-	}
-
-	origName := resource.GetName()
-	if origName == "" {
-		return yamlContent
-	}
-
-	// Normalize suffix by stripping the project prefix if present
-	suffix := origName
-	prefix := t.namePrefix + "-"
-	if strings.HasPrefix(origName, prefix) {
-		suffix = strings.TrimPrefix(origName, prefix)
-	}
-
-	// If the prefix is not the project name, we should keep the original name intact
-	if prefix != t.projectName+"-" {
-		return yamlContent
-	}
-
-	// Only template if the intended target follows the conventional suffix
-	// This keeps any custom user-provided names intact
-	// For default scaffolding, suffix is typically "controller-manager-metrics-monitor"
-	templated := "{{ include \"chart.name\" . }}-" + suffix
-
-	nameRe := regexp.MustCompile("(?m)^([\t ]*)name:\\s*" + regexp.QuoteMeta(origName) + "\\s*$")
-	yamlContent = nameRe.ReplaceAllString(yamlContent, "${1}name: "+templated)
-
-	return yamlContent
-}
-
 // addHelmLabelsAndAnnotations replaces kustomize managed-by labels with Helm equivalents
 func (t *HelmTemplater) addHelmLabelsAndAnnotations(yamlContent string, _ *unstructured.Unstructured) string {
 	// Replace app.kubernetes.io/managed-by: kustomize with Helm template

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

@@ -28,7 +28,6 @@ var _ = Describe("HelmTemplater", func() {
 	BeforeEach(func() {
 		templater = &HelmTemplater{
 			projectName: "test-project",
-			namePrefix:  "test-project",
 		}
 	})
 
@@ -226,43 +225,6 @@ metadata:
 			Expect(result).To(ContainSubstring("{{- end }}"))
 		})
 
-		Describe("should generate ServiceMonitor name correctly", func() {
-			var serviceMonitorResource *unstructured.Unstructured
-			var content string
-
-			BeforeEach(func() {
-				serviceMonitorResource = &unstructured.Unstructured{}
-				serviceMonitorResource.SetAPIVersion("monitoring.coreos.com/v1")
-				serviceMonitorResource.SetKind("ServiceMonitor")
-				serviceMonitorResource.SetName("test-project-controller-manager-metrics-monitor")
-
-				// Test content must end with a newline
-				// If not, the `name` regex in the ServiceMonitor replacement will never match
-				content = `apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: test-project-controller-manager-metrics-monitor
-`
-			})
-
-			It("should use chart.name template when namePrefix and project name are the same", func() {
-				result := templater.ApplyHelmSubstitutions(content, serviceMonitorResource)
-				// If the namePrefix and default chart name match, should use chart.name template
-				Expect(result).To(ContainSubstring("{{ include \"chart.name\" . }}"),
-					"Should use chart.name template when namePrefix and project name match")
-			})
-			It("should preserve the original name when the namePrefix and project name differ", func() {
-				templaterDiff := &HelmTemplater{
-					projectName: "project-with-a-long-name",
-					namePrefix:  "test-project",
-				}
-				result := templaterDiff.ApplyHelmSubstitutions(content, serviceMonitorResource)
-				// If the namePrefix and default chart name differ, should use namePrefix variable
-				Expect(result).ToNot(ContainSubstring("{{ include \"chart.name\" . }}"),
-					"Should not use chart.name template when namePrefix and project name differ")
-			})
-		})
-
 		It("should add metrics conditional for metrics services", func() {
 			serviceResource := &unstructured.Unstructured{}
 			serviceResource.SetAPIVersion("v1")
@@ -427,6 +389,24 @@ metadata:
 			Expect(result).To(ContainSubstring("name: test-project-controller-manager"))
 			Expect(result).NotTo(ContainSubstring("{{ include"))
 		})
+		It("should preserve name for ServiceMonitor", func() {
+			serviceMonitorResource := &unstructured.Unstructured{}
+			serviceMonitorResource.SetAPIVersion("monitoring.coreos.com/v1")
+			serviceMonitorResource.SetKind("ServiceMonitor")
+			serviceMonitorResource.SetName("test-project-controller-manager-metrics-monitor")
+
+			content := `apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: test-project-controller-manager-metrics-monitor`
+
+			result := templater.ApplyHelmSubstitutions(content, serviceMonitorResource)
+
+			// Name should remain unchanged
+			Expect(result).To(ContainSubstring("name: test-project-controller-manager-metrics-monitor"))
+			Expect(result).NotTo(ContainSubstring("{{ include"))
+		})
+
 	})
 
 	Context("edge cases", func() {