Merge pull request #3987 from Azure/hawkowl/fix-image-sync-dec24

Fix image syncing
Azure · Dec 3, 2024 · 1ab7a26 · 1ab7a26
2 parents 2cf3f04 + 8d08ce3
commit 1ab7a26
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/cmd/aro/mirror.go b/cmd/aro/mirror.go
@@ -95,8 +95,8 @@ func mirror(ctx context.Context, log *logrus.Entry) error {
 		"registry.redhat.io/openshift4/ose-tools-rhel8:v4.15",
 
 		// https://catalog.redhat.com/software/containers/openshift4/ose-cli-rhel9/6528096620ebdcf82af4cbf9
-		"registry.redhat.io/openshift4/ose-cli-rhel9:4.16",
-		"registry.redhat.io/openshift4/ose-cli-rhel9:4.17",
+		"registry.redhat.io/openshift4/ose-cli-rhel9:v4.16",
+		"registry.redhat.io/openshift4/ose-cli-rhel9:v4.17",
 		"registry.redhat.io/openshift4/ose-cli-rhel9:latest",
 
 		// https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8

diff --git a/pkg/cluster/deploybaseresources_additional_test.go b/pkg/cluster/deploybaseresources_additional_test.go
@@ -6,6 +6,8 @@ package cluster
 import (
 	"fmt"
 	"reflect"
+	"slices"
+	"strings"
 	"testing"
 
 	mgmtauthorization "github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-09-01-preview/authorization"
@@ -102,6 +104,13 @@ func TestDenyAssignment(t *testing.T) {
 			actualDenyAssignment := m.denyAssignment().Resource.(*mgmtauthorization.DenyAssignment)
 			actualExcludePrincipals := actualDenyAssignment.ExcludePrincipals
 
+			// Sort the principals coming back before we compare them
+			sortfunc := func(a mgmtauthorization.Principal, b mgmtauthorization.Principal) int {
+				return strings.Compare(*a.ID, *b.ID)
+			}
+			slices.SortFunc(*actualExcludePrincipals, sortfunc)
+			slices.SortFunc(*test.ExpectedExcludePrincipals, sortfunc)
+
 			if !reflect.DeepEqual(test.ExpectedExcludePrincipals, actualExcludePrincipals) {
 				t.Errorf("expected %+v, got %+v\n", test.ExpectedExcludePrincipals, actualExcludePrincipals)
 			}