Add service name from kustomize

Author: liam-mackie

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

@@ -150,7 +150,20 @@ func (s *editKustomizeScaffolder) Scaffold() error {
 	// provide one via kustomize (../prometheus). This avoids duplicate objects
 	// with the same name within the Helm chart.
 	if !hasPrometheus {
-		chartFiles = append(chartFiles, &charttemplates.ServiceMonitor{OutputDir: s.outputDir, NamePrefix: namePrefix})
+		// Find the metrics service name from parsed resources
+		metricsServiceName := namePrefix + "-controller-manager-metrics-service"
+		for _, svc := range resources.Services {
+			if strings.Contains(svc.GetName(), "metrics-service") {
+				metricsServiceName = svc.GetName()
+				break
+			}
+		}
+
+		chartFiles = append(chartFiles, &charttemplates.ServiceMonitor{
+			OutputDir:   s.outputDir,
+			NamePrefix:  namePrefix,
+			ServiceName: metricsServiceName,
+		})
 	}
 
 	// Generate template files from kustomize output

pkg/plugins/optional/helm/v2alpha/scaffolds/internal/templates/chart-templates/servicemonitor.go

@@ -29,11 +29,13 @@ var _ machinery.Template = &ServiceMonitor{}
 // ServiceMonitor scaffolds a ServiceMonitor for Prometheus monitoring in the Helm chart
 type ServiceMonitor struct {
 	machinery.TemplateMixin
-	machinery.ProjectNameMixin
 
 	// Prefix
 	NamePrefix string
 
+	// ServiceName is the full name of the metrics service, derived from Kustomize
+	ServiceName string
+
 	// OutputDir specifies the output directory for the chart
 	OutputDir string
 }
@@ -72,7 +74,7 @@ spec:
       bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
       tlsConfig:
         {{ "{{- if .Values.certManager.enable }}" }}
-        serverName: {{ .NamePrefix }}-controller-manager-metrics-service.{{ "{{ .Release.Namespace }}" }}.svc
+        serverName: {{ .ServiceName }}.{{ "{{ .Release.Namespace }}" }}.svc
         # Apply secure TLS configuration with cert-manager
         insecureSkipVerify: false
         ca: