Skip to content

OCPBUGS-85065: Fix repeated CPO Deployment churn due to OPENSHIFT_IMG_OVERRIDES reordering #8656

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

Draft
dhgautam99 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

OCPBUGS-85065: Fix repeated CPO Deployment churn due to OPENSHIFT_IMG_OVERRIDES reordering #8656

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
1 change: 1 addition & 0 deletions support/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ func ConvertOpenShiftImageRegistryOverridesToCommandLineFlag(registryOverrides m

for _, registrySource := range sortedRegistrySources {
registryReplacements := registryOverrides[registrySource]
sort.Strings(registryReplacements)
for _, registryReplacement := range registryReplacements {
commandLineFlagArray = append(commandLineFlagArray, fmt.Sprintf("%s=%s", registrySource, registryReplacement))
}
Expand Down
15 changes: 15 additions & 0 deletions support/util/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,21 @@ func TestConvertOpenShiftImageRegistryOverridesToCommandLineFlag(t *testing.T) {
},
expectedFlag: "registry1=mirror1.1,registry1=mirror1.2,registry1=mirror1.3,registry2=mirror2.1,registry2=mirror2.2,registry3=mirror3.1",
},
{
name: "When mirrors are in non-alphabetical order, it should sort them deterministically",
registryOverrides: map[string][]string{
"cp.icr.io/cp": {
"mirror-c.example.com",
"mirror-a.example.com",
"mirror-b.example.com",
},
"icr.io/cpopen": {
"mirror-z.example.com",
"mirror-x.example.com",
},
},
expectedFlag: "cp.icr.io/cp=mirror-a.example.com,cp.icr.io/cp=mirror-b.example.com,cp.icr.io/cp=mirror-c.example.com,icr.io/cpopen=mirror-x.example.com,icr.io/cpopen=mirror-z.example.com",
},
}

t.Parallel()
Expand Down