Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion internal/ocm/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ func NewOpenShiftVersionXYZ(v, cg string) string {
if len(parts) == 2 {
// Patch version is managed by Red Hat. This will be computed automatically to the latest
// as part of https://github.com/Azure/ARO-HCP/pull/4477
if patch, ok := map[string]string{"4.19": "31", "4.20": "23", "4.21": "16"}[v]; ok {
if patch, ok := map[string]string{"4.19": "34", "4.20": "25", "4.21": "20", "4.22": "1"}[v]; ok {
parts = append(parts, patch)
} else {
parts = append(parts, "0")
Expand Down
10 changes: 5 additions & 5 deletions internal/ocm/convert_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func TestWithImmutableAttributes(t *testing.T) {
},
want: ocmCluster(t, ocmClusterDefaults(api.TestLocation).
Version(arohcpv1alpha1.NewVersion().
ID("openshift-v4.20.23").
ID("openshift-v4.20.25").
ChannelGroup("stable"))),
},
{
Expand Down Expand Up @@ -125,7 +125,7 @@ func TestWithImmutableAttributes(t *testing.T) {
},
},
want: ocmCluster(t, ocmClusterDefaults(api.TestLocation).Version(
arohcpv1alpha1.NewVersion().ID("openshift-v4.19.31").ChannelGroup("stable"))),
arohcpv1alpha1.NewVersion().ID("openshift-v4.19.34").ChannelGroup("stable"))),
},
{
name: "with version 4.21",
Expand All @@ -135,7 +135,7 @@ func TestWithImmutableAttributes(t *testing.T) {
},
},
want: ocmCluster(t, ocmClusterDefaults(api.TestLocation).Version(
arohcpv1alpha1.NewVersion().ID("openshift-v4.21.16").ChannelGroup("stable"))),
arohcpv1alpha1.NewVersion().ID("openshift-v4.21.20").ChannelGroup("stable"))),
},
Comment thread
JakobGray marked this conversation as resolved.
Resolved
}

Expand Down Expand Up @@ -239,7 +239,7 @@ func ocmClusterDefaults(azureLocation string) *arohcpv1alpha1.ClusterBuilder {
Region(arohcpv1alpha1.NewCloudRegion().
ID(azureLocation)).
Version(arohcpv1alpha1.NewVersion().
ID("openshift-v4.20.23").
ID("openshift-v4.20.25").
ChannelGroup("stable")).
ImageRegistry(arohcpv1alpha1.NewClusterImageRegistry().
State(csImageRegistryStateEnabled)).
Expand Down Expand Up @@ -340,7 +340,7 @@ func TestBuildCSNodePool(t *testing.T) {
),
expectedCSNodePool: getBaseCSNodePoolBuilder().
Version(arohcpv1alpha1.NewVersion().
ID("openshift-v4.20.23").
ID("openshift-v4.20.25").
ChannelGroup("stable")),
},
{
Expand Down