From a7f5249802bdf2f9c786e3b8db089e9238f78b60 Mon Sep 17 00:00:00 2001
From: Kaustubh Pande <kaustubhpande.kp@gmail.com>
Date: Fri, 31 Oct 2025 22:24:59 +0530
Subject: [PATCH] fix must gather image name

---
 pkg/dockerfilegen/generator.go       | 8 +-------
 pkg/konfluxgen/release.template.yaml | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkg/dockerfilegen/generator.go b/pkg/dockerfilegen/generator.go
index 270be2c33..3cefb7860 100644
--- a/pkg/dockerfilegen/generator.go
+++ b/pkg/dockerfilegen/generator.go
@@ -456,12 +456,8 @@ func generateMustGatherDockerfile(params Params) error {
 		soVersion = fmt.Sprintf("%v.%v", semVer.Major, semVer.Minor)
 	}
 	elVersion := "el" + strings.TrimPrefix(rhelVersion, "rhel-")
-	// Compute base values
-	componentDashcase := ""
-	projectDashcase := projectDashCaseWithSep
 
 	// Apply overrides
-	labelName := adjustComponentName(projectDashcase, componentDashcase, strings.ReplaceAll(rhelVersion, "-", ""))
 	d := map[string]interface{}{
 		"main":             projectName,
 		"oc_cli_artifacts": ocClientArtifactsImage,
@@ -472,7 +468,7 @@ func generateMustGatherDockerfile(params Params) error {
 		"rhelVersion":      strings.ReplaceAll(rhelVersion, "-", ""),
 		"short_version":    soVersion,
 		"shortRhelVersion": elVersion,
-		"name":             labelName,
+		"name":             fmt.Sprintf("serverless-must-gather-%s", strings.ReplaceAll(rhelVersion, "-", "")),
 	}
 	// Pick proper template FS file and RPM lock file
 	templateFile := "dockerfile-templates/rhel-9/*.tmpl" // RHEL9 default
@@ -719,8 +715,6 @@ func adjustComponentName(projectDashcase, componentDashcase, rhelVersion string)
 		combinedName = "serverless-ingress"
 	case "knative-operator":
 		combinedName = "serverless-kn-operator"
-	case "svls-must-gather":
-		combinedName = "serverless-must-gather"
 	case "openshift-knative-operator":
 		return "serverless-openshift-kn-" + rhelVersion + "-operator"
 	//this case if for image name only need `kn-*` prefix
diff --git a/pkg/konfluxgen/release.template.yaml b/pkg/konfluxgen/release.template.yaml
index 0f1cecec0..82a2e20a4 100644
--- a/pkg/konfluxgen/release.template.yaml
+++ b/pkg/konfluxgen/release.template.yaml
@@ -9,4 +9,4 @@ spec:
     releaseNotes:
       references:
         - "https://docs.redhat.com/documentation/red_hat_openshift_serverless/"
-      type: "RHEA"
\ No newline at end of file
+      type: "RHEA"