Skip to content

[cloud_hotfix_releases] MGMT-17369: Add multi-arch release images to as well when setting "only_latest=true" in ".../openshift-versions" #6138

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
Mar 29, 2024
Merged

[cloud_hotfix_releases] MGMT-17369: Add multi-arch release images to as well when setting "only_latest=true" in ".../openshift-versions" #6138

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
33 changes: 29 additions & 4 deletions internal/versions/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package versions

import (
context "context"
"fmt"
"strings"

middleware "github.com/go-openapi/runtime/middleware"
Expand All @@ -13,6 +14,7 @@ import (
"github.com/openshift/assisted-service/restapi"
operations "github.com/openshift/assisted-service/restapi/operations/versions"
"github.com/pkg/errors"
"github.com/samber/lo"
"github.com/sirupsen/logrus"
"github.com/thoas/go-funk"
)
Expand Down Expand Up @@ -78,7 +80,7 @@ func GetModelVersions(v Versions) models.Versions {
// getLatestReleaseImageForMajorMinor returns the latest release image matching a given major.minor version,
// 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 getLatestReleaseImageForMajorMinor(releaseImages models.ReleaseImages, majorMinorVersion string) (*models.ReleaseImage, error) {
func getLatestReleaseImageForMajorMinor(releaseImages models.ReleaseImages, majorMinorVersion string, log logrus.FieldLogger) (*models.ReleaseImage, error) {
var latestReleaseImage *models.ReleaseImage
for _, releaseImage := range releaseImages {
// Typically, releaseImage.OpenshiftVersion follow the major.minor format, though exceptions exist with static release images.
Expand Down Expand Up @@ -112,10 +114,28 @@ func getLatestReleaseImageForMajorMinor(releaseImages models.ReleaseImages, majo
}
}

log.Debugf("Found latest release image version '%s' for majorMinorVersion '%s'", *latestReleaseImage.Version, majorMinorVersion)

return latestReleaseImage, nil
}

func filterReleaseImagesByOnlyLatest(releaseImages models.ReleaseImages, onlyLatest *bool) (models.ReleaseImages, error) {
// getMultiArchReleaseImage retrieves multi arch release image matching a given x.y.z version.
func getMultiArchReleaseImage(releaseImages models.ReleaseImages, version string, log logrus.FieldLogger) *models.ReleaseImage {
if !strings.HasSuffix(version, "-multi") {
version = fmt.Sprintf("%s-multi", version)
}

if releaseImage, ok := lo.Find(releaseImages, func(releaseImage *models.ReleaseImage) bool {
return swag.StringValue(releaseImage.Version) == version
}); ok {
log.Debugf("Found multi-arch release image for version '%s'", version)
return releaseImage
}

return nil
}

func filterReleaseImagesByOnlyLatest(releaseImages models.ReleaseImages, onlyLatest *bool, log logrus.FieldLogger) (models.ReleaseImages, error) {
if !swag.BoolValue(onlyLatest) {
return releaseImages, nil
}
Expand All @@ -134,11 +154,16 @@ func filterReleaseImagesByOnlyLatest(releaseImages models.ReleaseImages, onlyLat

filteredReleaseImages := models.ReleaseImages{}
for majorMinorVersion := range releaseImagesMajorMinorVersionsSet {
latestReleaseImageForMajorMinor, err := getLatestReleaseImageForMajorMinor(releaseImages, majorMinorVersion)
latestReleaseImageForMajorMinor, err := getLatestReleaseImageForMajorMinor(releaseImages, majorMinorVersion, log)
if err != nil {
return nil, errors.Wrapf(err, "error occurred while trying to get the latest release image for version: %s", majorMinorVersion)
}
filteredReleaseImages = append(filteredReleaseImages, latestReleaseImageForMajorMinor)
// Add the matching multi-arch release image if exists as well
matchingMultiArchReleaseImage := getMultiArchReleaseImage(releaseImages, *latestReleaseImageForMajorMinor.Version, log)
if matchingMultiArchReleaseImage != nil {
filteredReleaseImages = append(filteredReleaseImages, matchingMultiArchReleaseImage)
}
}

return filteredReleaseImages, nil
Expand Down Expand Up @@ -206,7 +231,7 @@ func (h *apiHandler) V2ListSupportedOpenshiftVersions(ctx context.Context, param

releaseImages = filterIgnoredVersions(h.log, releaseImages, handler.ignoredOpenshiftVersions)
releaseImagesByVersionPattern := filterReleaseImagesByVersion(releaseImages, params.Version)
releaseImagesByOnlyLatest, err := filterReleaseImagesByOnlyLatest(releaseImages, params.OnlyLatest)
releaseImagesByOnlyLatest, err := filterReleaseImagesByOnlyLatest(releaseImages, params.OnlyLatest, h.log)
if err != nil {
return common.GenerateErrorResponder(err)
}
Expand Down
52 changes: 52 additions & 0 deletions internal/versions/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,14 @@ var _ = Describe("V2ListSupportedOpenshiftVersions", func() {
Version: swag.String("4.11.2"),
SupportLevel: models.ReleaseImageSupportLevelProduction,
},
{
CPUArchitecture: swag.String(common.MultiCPUArchitecture),
CPUArchitectures: []string{common.X86CPUArchitecture, common.ARM64CPUArchitecture},
OpenshiftVersion: swag.String("4.11-multi"),
URL: swag.String("quay.io/openshift-release-dev/ocp-release:4.11.2-multi"),
Version: swag.String("4.11.2-multi"),
SupportLevel: models.ReleaseImageSupportLevelProduction,
},
{
CPUArchitecture: swag.String(common.X86CPUArchitecture),
CPUArchitectures: []string{common.X86CPUArchitecture},
Expand Down Expand Up @@ -522,6 +530,14 @@ var _ = Describe("V2ListSupportedOpenshiftVersions", func() {
Version: swag.String("4.13.2"),
SupportLevel: models.OpenshiftVersionSupportLevelBeta,
},
{
CPUArchitecture: swag.String(common.MultiCPUArchitecture),
CPUArchitectures: []string{common.X86CPUArchitecture, common.ARM64CPUArchitecture},
OpenshiftVersion: swag.String("4.13-multi"),
URL: swag.String("quay.io/openshift-release-dev/ocp-release:4.13.2-multi"),
Version: swag.String("4.13.2-multi"),
SupportLevel: models.OpenshiftVersionSupportLevelBeta,
},
}

osImages := osImageList{
Expand All @@ -531,6 +547,12 @@ var _ = Describe("V2ListSupportedOpenshiftVersions", func() {
URL: swag.String("https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.11/4.11.48/rhcos-4.11.48-x86_64-live.x86_64.iso"),
Version: swag.String("411.86.202308081056-0"),
},
{
OpenshiftVersion: swag.String("4.11"),
CPUArchitecture: swag.String(common.ARM64CPUArchitecture),
URL: swag.String("https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.11/4.11.48/rhcos-4.11.48-aarch64-live.aarch64.iso"),
Version: swag.String("411.86.202308081056-0"),
},
{
OpenshiftVersion: swag.String("4.12"),
CPUArchitecture: swag.String(common.X86CPUArchitecture),
Expand All @@ -543,6 +565,12 @@ var _ = Describe("V2ListSupportedOpenshiftVersions", func() {
URL: swag.String("https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.13/4.13.48/rhcos-4.13.48-x86_64-live.x86_64.iso"),
Version: swag.String("413.86.202308081056-0"),
},
{
OpenshiftVersion: swag.String("4.13"),
CPUArchitecture: swag.String(common.ARM64CPUArchitecture),
URL: swag.String("https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/4.13/4.13.48/rhcos-4.13.48-aarch64-live.aarch64.iso"),
Version: swag.String("411.86.202308081056-0"),
},
}

var handler restapi.VersionsAPI
Expand Down Expand Up @@ -570,6 +598,12 @@ var _ = Describe("V2ListSupportedOpenshiftVersions", func() {
SupportLevel: swag.String(models.ReleaseImageSupportLevelProduction),
Default: false,
},
"4.11.2-multi": {
DisplayName: swag.String("4.11.2-multi"),
CPUArchitectures: []string{common.X86CPUArchitecture, common.ARM64CPUArchitecture},
SupportLevel: swag.String(models.ReleaseImageSupportLevelProduction),
Default: false,
},
"4.12.1": {
DisplayName: swag.String("4.12.1"),
CPUArchitectures: []string{common.X86CPUArchitecture},
Expand All @@ -594,6 +628,12 @@ var _ = Describe("V2ListSupportedOpenshiftVersions", func() {
SupportLevel: swag.String(models.OpenshiftVersionSupportLevelBeta),
Default: false,
},
"4.13.2-multi": {
DisplayName: swag.String("4.13.2-multi"),
CPUArchitectures: []string{common.X86CPUArchitecture, common.ARM64CPUArchitecture},
SupportLevel: swag.String(models.OpenshiftVersionSupportLevelBeta),
Default: false,
},
}

reply := handler.V2ListSupportedOpenshiftVersions(
Expand All @@ -612,6 +652,12 @@ var _ = Describe("V2ListSupportedOpenshiftVersions", func() {
SupportLevel: swag.String(models.ReleaseImageSupportLevelProduction),
Default: false,
},
"4.11.2-multi": {
DisplayName: swag.String("4.11.2-multi"),
CPUArchitectures: []string{common.X86CPUArchitecture, common.ARM64CPUArchitecture},
SupportLevel: swag.String(models.ReleaseImageSupportLevelProduction),
Default: false,
},
"4.12.1": {
DisplayName: swag.String("4.12.1"),
CPUArchitectures: []string{common.X86CPUArchitecture},
Expand All @@ -624,6 +670,12 @@ var _ = Describe("V2ListSupportedOpenshiftVersions", func() {
SupportLevel: swag.String(models.OpenshiftVersionSupportLevelBeta),
Default: false,
},
"4.13.2-multi": {
DisplayName: swag.String("4.13.2-multi"),
CPUArchitectures: []string{common.X86CPUArchitecture, common.ARM64CPUArchitecture},
SupportLevel: swag.String(models.OpenshiftVersionSupportLevelBeta),
Default: false,
},
}

reply := handler.V2ListSupportedOpenshiftVersions(
Expand Down