Skip to content

Commit a743e2e

Browse files
committed
Use higher version for must-gather on RHEL 9
1 parent f125c3b commit a743e2e

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

pkg/dockerfilegen/generator.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,13 @@ func generateMustGatherDockerfile(params Params) error {
420420
return fmt.Errorf("%w: Could not read metadata file: %w",
421421
ErrBadConf, errors.WithStack(err))
422422
}
423-
424423
ocClientArtifactsImage := fmt.Sprintf(ocClientArtifactsBaseImage, metadata.Requirements.OcpVersion.Min)
424+
if metadata.Project.Version != "" {
425+
// explicit override OCP min version due to RHEL 9 images since 1.37
426+
if semver.New(metadata.Project.Version).Minor >= 37 && metadata.Requirements.OcpVersion.Min == "4.14" {
427+
ocClientArtifactsImage = fmt.Sprintf(ocClientArtifactsBaseImage, "4.15")
428+
}
429+
}
425430
projectName := mustGatherDockerfileTemplateName
426431
projectDashCaseWithSep := projectName + "-"
427432

0 commit comments

Comments
 (0)