Skip to content

image-mirroring: Drop driver-toolkit from OKD 4.{13,14} #43957

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-ci merged 1 commit into from
Oct 24, 2023
Merged

image-mirroring: Drop driver-toolkit from OKD 4.{13,14} #43957

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: 0 additions & 1 deletion core-services/image-mirroring/openshift/mapping_origin_4_13
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ registry.ci.openshift.org/origin/4.13:descheduler quay.io/openshift/origin-desch
registry.ci.openshift.org/origin/4.13:docker-builder quay.io/openshift/origin-docker-builder:4.13 quay.io/openshift/origin-docker-builder:4.13.0
registry.ci.openshift.org/origin/4.13:docker-registry quay.io/openshift/origin-docker-registry:4.13 quay.io/openshift/origin-docker-registry:4.13.0
registry.ci.openshift.org/origin/4.13:dpu-network-operator quay.io/openshift/origin-dpu-network-operator:4.13 quay.io/openshift/origin-dpu-network-operator:4.13.0
registry.ci.openshift.org/origin/4.13:driver-toolkit quay.io/openshift/origin-driver-toolkit:4.13 quay.io/openshift/origin-driver-toolkit:4.13.0
registry.ci.openshift.org/origin/4.13:driver-toolkit-tests quay.io/openshift/origin-driver-toolkit-tests:4.13 quay.io/openshift/origin-driver-toolkit-tests:4.13.0
registry.ci.openshift.org/origin/4.13:egress-dns-proxy quay.io/openshift/origin-egress-dns-proxy:4.13 quay.io/openshift/origin-egress-dns-proxy:4.13.0
registry.ci.openshift.org/origin/4.13:egress-http-proxy quay.io/openshift/origin-egress-http-proxy:4.13 quay.io/openshift/origin-egress-http-proxy:4.13.0
Expand Down
1 change: 0 additions & 1 deletion core-services/image-mirroring/openshift/mapping_origin_4_14
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ registry.ci.openshift.org/origin/4.14:descheduler quay.io/openshift/origin-desch
registry.ci.openshift.org/origin/4.14:docker-builder quay.io/openshift/origin-docker-builder:4.14 quay.io/openshift/origin-docker-builder:4.14.0
registry.ci.openshift.org/origin/4.14:docker-registry quay.io/openshift/origin-docker-registry:4.14 quay.io/openshift/origin-docker-registry:4.14.0
registry.ci.openshift.org/origin/4.14:dpu-network-operator quay.io/openshift/origin-dpu-network-operator:4.14 quay.io/openshift/origin-dpu-network-operator:4.14.0
registry.ci.openshift.org/origin/4.14:driver-toolkit quay.io/openshift/origin-driver-toolkit:4.14 quay.io/openshift/origin-driver-toolkit:4.14.0
Copy link
Member

@ybettan ybettan Oct 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we care about older versions? Can't we just keep machine-os-content for older version of OCP and only remove it in newer versions?

Copy link
Contributor Author

@LorbusChris LorbusChris Oct 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

machine-os-content is not touched here. This change removes an OCP CI image that has been leaking into OKD releases (driver-toolkit).

registry.ci.openshift.org/origin/4.14:driver-toolkit-tests quay.io/openshift/origin-driver-toolkit-tests:4.14 quay.io/openshift/origin-driver-toolkit-tests:4.14.0
registry.ci.openshift.org/origin/4.14:egress-dns-proxy quay.io/openshift/origin-egress-dns-proxy:4.14 quay.io/openshift/origin-egress-dns-proxy:4.14.0
registry.ci.openshift.org/origin/4.14:egress-http-proxy quay.io/openshift/origin-egress-http-proxy:4.14 quay.io/openshift/origin-egress-http-proxy:4.14.0
Expand Down
6 changes: 4 additions & 2 deletions core-services/release-controller/_releases/release-ocp-4.13-ci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
"machine-os-images",
"windows-machine-config-bootstrapper-tests",
"windows-machine-config-operator-bundle",
"windows-machine-config-operator-test"
"windows-machine-config-operator-test",
"driver-toolkit"
]
}
},
Expand Down Expand Up @@ -87,7 +88,8 @@
"machine-os-images",
"windows-machine-config-bootstrapper-tests",
"windows-machine-config-operator-bundle",
"windows-machine-config-operator-test"
"windows-machine-config-operator-test",
"driver-toolkit"
]
}
},
Expand Down
6 changes: 4 additions & 2 deletions core-services/release-controller/_releases/release-ocp-4.14-ci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
"machine-os-images",
"windows-machine-config-bootstrapper-tests",
"windows-machine-config-operator-bundle",
"windows-machine-config-operator-test"
"windows-machine-config-operator-test",
"driver-toolkit"
]
}
},
Expand Down Expand Up @@ -87,7 +88,8 @@
"machine-os-images",
"windows-machine-config-bootstrapper-tests",
"windows-machine-config-operator-bundle",
"windows-machine-config-operator-test"
"windows-machine-config-operator-test",
"driver-toolkit"
]
}
},
Expand Down