Skip to content

[cloud_hotfix_releases] MGMT-17513: Change the latest release image retrieved in GetReleaseImage using major.minor OpenShift version to latest non-beta release image if exists, or latest beta release image otherwise #6205

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
openshift-merge-bot merged 1 commit into from
Apr 18, 2024
Merged

[cloud_hotfix_releases] MGMT-17513: Change the latest release image retrieved in GetReleaseImage using major.minor OpenShift version to latest non-beta release image if exists, or latest beta release image otherwise #6205

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
16 changes: 13 additions & 3 deletions internal/versions/rest_api_versions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ func validateCPUArchitecture(cpuArchitecture string) error {
return releaseImage.Validate(strfmt.Default)
}

// getLatestReleaseImage returns the latest release image among a list of release images not included in ignore list,
// or error if none of the release images match. The latest release image is considered the latest none beta release image,
// or if all matching release images are beta then just the latest.
func getLatestReleaseImage(releaseImages models.ReleaseImages, ignoredOpenshiftVersions []string) (*models.ReleaseImage, error) {
var latestReleaseImage *models.ReleaseImage

Expand All @@ -176,13 +179,20 @@ func getLatestReleaseImage(releaseImages models.ReleaseImages, ignoredOpenshiftV
continue
}

lessThan, err := common.BaseVersionLessThan(*releaseImage.Version, *latestReleaseImage.Version)
isLatest, err := common.BaseVersionLessThan(*releaseImage.Version, *latestReleaseImage.Version)
if err != nil {
return nil, err
}

if lessThan {
latestReleaseImage = releaseImage
// none-beta > beta, later-beta > beta
if latestReleaseImage.SupportLevel == models.OpenshiftVersionSupportLevelBeta {
if isLatest || releaseImage.SupportLevel != models.OpenshiftVersionSupportLevelBeta {
latestReleaseImage = releaseImage
}
} else { // non-beta-later > non-beta
if isLatest && releaseImage.SupportLevel != models.OpenshiftVersionSupportLevelBeta {
latestReleaseImage = releaseImage
}
}
}

Expand Down
25 changes: 24 additions & 1 deletion internal/versions/rest_api_versions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,15 @@ var _ = Describe("GetReleaseImage", func() {
SupportLevel: models.ReleaseImageSupportLevelProduction,
Default: false,
},
{
OpenshiftVersion: swag.String("4.14"),
Version: swag.String("4.14.3"),
CPUArchitecture: swag.String(common.X86CPUArchitecture),
CPUArchitectures: []string{common.X86CPUArchitecture},
URL: swag.String("quay.io/openshift-release-dev/ocp-release:4.14.3-x86_64"),
SupportLevel: models.OpenshiftVersionSupportLevelBeta,
Default: false,
},
{
OpenshiftVersion: swag.String("4.14"),
Version: swag.String("4.14.3"),
Expand All @@ -94,13 +103,23 @@ var _ = Describe("GetReleaseImage", func() {
SupportLevel: models.ReleaseImageSupportLevelProduction,
Default: false,
},

{
OpenshiftVersion: swag.String("4.15"),
Version: swag.String("4.15.1"),
CPUArchitecture: swag.String(common.X86CPUArchitecture),
CPUArchitectures: []string{common.X86CPUArchitecture},
URL: swag.String("quay.io/openshift-release-dev/ocp-release:4.15.1-x86_64"),
SupportLevel: models.ReleaseImageSupportLevelProduction,
SupportLevel: models.OpenshiftVersionSupportLevelBeta,
Default: false,
},
{
OpenshiftVersion: swag.String("4.15"),
Version: swag.String("4.15.2"),
CPUArchitecture: swag.String(common.X86CPUArchitecture),
CPUArchitectures: []string{common.X86CPUArchitecture},
URL: swag.String("quay.io/openshift-release-dev/ocp-release:4.15.2-x86_64"),
SupportLevel: models.OpenshiftVersionSupportLevelBeta,
Default: false,
},
}
Expand All @@ -111,6 +130,10 @@ var _ = Describe("GetReleaseImage", func() {
releaseImage, err := handler.GetReleaseImage(ctx, "4.14", common.X86CPUArchitecture, pullSecret)
Expect(err).ShouldNot(HaveOccurred())
Expect(*releaseImage.Version).Should(Equal("4.14.2"))

releaseImage, err = handler.GetReleaseImage(ctx, "4.15", common.X86CPUArchitecture, pullSecret)
Expect(err).ShouldNot(HaveOccurred())
Expect(*releaseImage.Version).Should(Equal("4.15.2"))
})

It("gets the exact matching release image with major.minor.patch / prerelease openshiftVersion", func() {
Expand Down