Skip to content

fix: skip stale registry.ci ocp spec in OfficialImageTagFrom #5222

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
Jun 2, 2026
+15 −2
Merged

fix: skip stale registry.ci ocp spec in OfficialImageTagFrom #5222

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
4 changes: 2 additions & 2 deletions pkg/steps/utils/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ func FindSpecTag(is *imagev1.ImageStream, tag string) *coreapi.ObjectReference {
// OfficialImageTagFrom returns an import source from spec, then status, then quay-proxy.
func OfficialImageTagFrom(source *imagev1.ImageStream, base api.ImageStreamTagReference) *coreapi.ObjectReference {
if source != nil {
if ref := FindSpecTag(source, base.Tag); ref != nil && ref.Name != "" {
if ref := FindSpecTag(source, base.Tag); ref != nil && ref.Name != "" && (ref.Kind != "DockerImage" || !strings.HasPrefix(ref.Name, api.ServiceDomainAPPCIRegistry+"/ocp/")) {
return ref
}
if ref, _ := FindStatusTag(source, base.Tag); ref != nil && ref.Name != "" {
if ref, _ := FindStatusTag(source, base.Tag); ref != nil && ref.Name != "" && (ref.Kind != "DockerImage" || !strings.HasPrefix(ref.Name, api.ServiceDomainAPPCIRegistry+"/ocp/")) {
return ref
}
}
Expand Down
13 changes: 13 additions & 0 deletions pkg/steps/utils/image_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,19 @@ func TestResolveOfficialInputFrom(t *testing.T) {
wantOK: true,
wantFrom: &coreapi.ObjectReference{Kind: "DockerImage", Name: api.QuayImageReference(base)},
},
{
name: "skip stale registry.ci ocp spec",
base: api.ImageStreamTagReference{Namespace: "ocp", Name: "4.16", Tag: "base-rhel9"},
objects: []runtime.Object{&imagev1.ImageStream{
ObjectMeta: metav1.ObjectMeta{Namespace: "ocp", Name: "4.16"},
Spec: imagev1.ImageStreamSpec{Tags: []imagev1.TagReference{{
Name: "base-rhel9",
From: &coreapi.ObjectReference{Kind: "DockerImage", Name: "registry.ci.openshift.org/ocp/4.16@sha256:dead"},
}}},
}},
wantOK: true,
wantFrom: &coreapi.ObjectReference{Kind: "DockerImage", Name: api.QuayImageReference(api.ImageStreamTagReference{Namespace: "ocp", Name: "4.16", Tag: "base-rhel9"})},
},
{
name: "stable first",
base: api.ImageStreamTagReference{Namespace: "ocp", Name: "4.22", Tag: "cli"},
Expand Down