Skip to content

fix must gather image name #831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kaustubh-pande merged 1 commit into from
Oct 31, 2025
Merged

fix must gather image name #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions pkg/dockerfilegen/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/konfluxgen/release.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ spec:
releaseNotes:
references:
- "https://docs.redhat.com/documentation/red_hat_openshift_serverless/"
type: "RHEA"
type: "RHEA"
Loading