Skip to content

OCPBUGS-100066: skip wildcard sources in IDMS/ICSP image reference parsing #2351

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

Open
savio87 wants to merge 2 commits into
base: main
Choose a base branch
from
+96 −0
Open

OCPBUGS-100066: skip wildcard sources in IDMS/ICSP image reference parsing #2351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b461bb9
OCPBUGS-100066: skip wildcard sources in IDMS/ICSP image reference pa…
savio87 Aug 6, 2026
9395484
OCPBUGS-100066: remove source from wildcard skip log messages
savio87 Aug 6, 2026
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
8 changes: 8 additions & 0 deletions pkg/cli/image/strategy/onerror.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ func alternativeImageSourcesICSP(imageRef reference.DockerImageReference, icspLi
for _, icsp := range icspList {
repoDigestMirrors := icsp.Spec.RepositoryDigestMirrors
for _, rdm := range repoDigestMirrors {
if strings.HasPrefix(rdm.Source, "*.") {
klog.V(5).Infof("Skipping wildcard ICSP source entry")
continue
}
var suffix string
var err error
rdmSourceRef, err := reference.Parse(rdm.Source)
Expand Down Expand Up @@ -229,6 +233,10 @@ func alternativeImageSourcesIDMS(imageRef reference.DockerImageReference, idmsLi
for _, idms := range idmsList {
repoDigestMirrors := idms.Spec.ImageDigestMirrors
for _, rdm := range repoDigestMirrors {
if strings.HasPrefix(rdm.Source, "*.") {
klog.V(5).Infof("Skipping wildcard IDMS source entry")
continue
}
var suffix string
var err error
rdmSourceRef, err := reference.Parse(rdm.Source)
Expand Down
88 changes: 88 additions & 0 deletions pkg/cli/image/strategy/onerror_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,50 @@ func TestOnErrorICSPStrategy(t *testing.T) {
image: "quay.io/ocp-test/release:4.5",
imageSourcesExpected: []string{"quay.io/ocp-test/release"},
},
{
name: "wildcard source is skipped",
icspList: []operatorv1alpha1.ImageContentSourcePolicy{
{
Spec: operatorv1alpha1.ImageContentSourcePolicySpec{
RepositoryDigestMirrors: []operatorv1alpha1.RepositoryDigestMirrors{
{
Source: "*.redhat.com",
Mirrors: []string{
"mirror.internal/redhat",
},
},
{
Source: "quay.io/ocp-test/release",
Mirrors: []string{
"someregistry/mirrors/match",
},
},
},
},
},
},
image: "quay.io/ocp-test/release:4.5",
imageSourcesExpected: []string{"quay.io/ocp-test/release", "someregistry/mirrors/match"},
},
{
name: "all wildcard sources skipped returns only original",
icspList: []operatorv1alpha1.ImageContentSourcePolicy{
{
Spec: operatorv1alpha1.ImageContentSourcePolicySpec{
RepositoryDigestMirrors: []operatorv1alpha1.RepositoryDigestMirrors{
{
Source: "*.redhat.com",
Mirrors: []string{
"mirror.internal/redhat",
},
},
},
},
},
},
image: "quay.io/ocp-test/release:4.5",
imageSourcesExpected: []string{"quay.io/ocp-test/release"},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down Expand Up @@ -468,6 +512,50 @@ func TestOnErrorIDMSStrategy(t *testing.T) {
image: "quay.io/ocp-test/release:4.5",
imageSourcesExpected: []string{"quay.io/ocp-test/release"},
},
{
name: "wildcard source is skipped",
idmsList: []apicfgv1.ImageDigestMirrorSet{
{
Spec: apicfgv1.ImageDigestMirrorSetSpec{
ImageDigestMirrors: []apicfgv1.ImageDigestMirrors{
{
Source: "*.redhat.com",
Mirrors: []apicfgv1.ImageMirror{
"mirror.internal/redhat",
},
},
{
Source: "quay.io/ocp-test/release",
Mirrors: []apicfgv1.ImageMirror{
"someregistry/mirrors/match",
},
},
},
},
},
},
image: "quay.io/ocp-test/release:4.5",
imageSourcesExpected: []string{"quay.io/ocp-test/release", "someregistry/mirrors/match"},
},
{
name: "all wildcard sources skipped returns only original",
idmsList: []apicfgv1.ImageDigestMirrorSet{
{
Spec: apicfgv1.ImageDigestMirrorSetSpec{
ImageDigestMirrors: []apicfgv1.ImageDigestMirrors{
{
Source: "*.redhat.com",
Mirrors: []apicfgv1.ImageMirror{
"mirror.internal/redhat",
},
},
},
},
},
},
image: "quay.io/ocp-test/release:4.5",
imageSourcesExpected: []string{"quay.io/ocp-test/release"},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down