Skip to content

NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2025-10-05-124915_amd64-2025-10-05_arm64-2025-10-05 #5559

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 4 commits into from
Oct 6, 2025
Merged

NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2025-10-05-124915_amd64-2025-10-05_arm64-2025-10-05 #5559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7a9f6a
update last_rebase.sh
Oct 6, 2025
1763841
update changelog
Oct 6, 2025
0a01848
update manifests
Oct 6, 2025
15917b5
update buildfiles
Oct 6, 2025
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
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.20.0-0.nightly-arm64-2025-10-02-190239
OCP_VERSION := 4.20.0-0.nightly-arm64-2025-10-05-192559
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.20.0-0.nightly-2025-10-02-162542
OCP_VERSION := 4.20.0-0.nightly-2025-10-05-124915
2 changes: 1 addition & 1 deletion assets/components/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.20.0-0.nightly-arm64-2025-10-02-190239"
"base": "4.20.0-0.nightly-arm64-2025-10-05-192559"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d60157c899746eb6aa89bb7679498d9860e90e26864368d23f8e320d65eb3fa",
Expand Down
2 changes: 1 addition & 1 deletion assets/components/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.20.0-0.nightly-2025-10-02-162542"
"base": "4.20.0-0.nightly-2025-10-05-124915"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39e2432ebf8a9a8b50f5df0ad20742a503f2935ff12f538b82582bf96eeb0e52",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/kube-proxy/release-kube-proxy-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.20.0-0.nightly-arm64-2025-10-02-190239"
"base": "4.20.0-0.nightly-arm64-2025-10-05-192559"
},
"images": {
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:06a2f6765655e37786e9012ba9654d27c18ae81118af55d39e015405c9a837cb"
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/kube-proxy/release-kube-proxy-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.20.0-0.nightly-2025-10-02-162542"
"base": "4.20.0-0.nightly-2025-10-05-124915"
},
"images": {
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da800417f4680f68677c79a300e9dbc2c8177a8f3645538826bdc0817630d245"
Expand Down
4 changes: 2 additions & 2 deletions assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:af2a6084a7dd8a676c4f883df9549ce98294cf1495897a8a7ab39e0887f898e5
digest: sha256:a6e97dd4245aea1d58ef7bb28237a2c3be836500ac4d4d5b4370e4ce7d6319ba
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:20eebcc261479fae411ed27d67619cdee13b7d529bb4f0a9bb574231131a6a27
Expand All @@ -21,7 +21,7 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af2a6084a7dd8a676c4f883df9549ce98294cf1495897a8a7ab39e0887f898e5
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6e97dd4245aea1d58ef7bb28237a2c3be836500ac4d4d5b4370e4ce7d6319ba
target:
kind: Deployment
labelSelector: app=catalog-operator
4 changes: 2 additions & 2 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:8a84254cbf1dda84bcb83c539361cae34145c881b09ba35bba9ea6707ff6282c
digest: sha256:0f7d1f208882cf6ccea2f21c6ea536947eabfe3c4ef8d24c5d08924c3cbfe858
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:3cb3214fe7c72ebdbcd2dd3d732218a62d67730f9c151c4cba39f8b988f08487
Expand All @@ -21,7 +21,7 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a84254cbf1dda84bcb83c539361cae34145c881b09ba35bba9ea6707ff6282c
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f7d1f208882cf6ccea2f21c6ea536947eabfe3c4ef8d24c5d08924c3cbfe858
target:
kind: Deployment
labelSelector: app=catalog-operator
4 changes: 2 additions & 2 deletions assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.20.0-0.nightly-arm64-2025-10-02-190239"
"base": "4.20.0-0.nightly-arm64-2025-10-05-192559"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af2a6084a7dd8a676c4f883df9549ce98294cf1495897a8a7ab39e0887f898e5",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6e97dd4245aea1d58ef7bb28237a2c3be836500ac4d4d5b4370e4ce7d6319ba",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20eebcc261479fae411ed27d67619cdee13b7d529bb4f0a9bb574231131a6a27",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b55bb81d7a797bafd07e007f756d81b8e509310c20a7c267d041addf07bd7f8"
}
Expand Down
4 changes: 2 additions & 2 deletions assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.20.0-0.nightly-2025-10-02-162542"
"base": "4.20.0-0.nightly-2025-10-05-124915"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a84254cbf1dda84bcb83c539361cae34145c881b09ba35bba9ea6707ff6282c",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f7d1f208882cf6ccea2f21c6ea536947eabfe3c4ef8d24c5d08924c3cbfe858",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3cb3214fe7c72ebdbcd2dd3d732218a62d67730f9c151c4cba39f8b988f08487",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c37666c51f61a4580e4338c3dc2b74023efad2841b9a1f971e199d0d4c0b6ec"
}
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.20.0-0.nightly-arm64-2025-10-02-190239"
"base": "4.20.0-0.nightly-arm64-2025-10-05-192559"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0dab63015ad38f1d177834dbe70e45684bad4edcb2becc4094c84be514a124f1",
Expand All @@ -9,7 +9,7 @@
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b55bb81d7a797bafd07e007f756d81b8e509310c20a7c267d041addf07bd7f8",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:45fff394922fd6313f589bdfc5f4d50f19c2824ac28cf7a2c22002aa8c93e106",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b80e1edea8e96a60e57942e47845ef0bb0665970c82e241035dda6cc9bac2f0",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03b8d606e6bcfd2d383fe3c883bc951f6155003e13873530a8d78056bd7c751f",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9689064caf3f0296246b5e28180b2e6c0c45505ab092c13a2ff29d3dfe039f14",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0858dcc7dc11aec978d2905f85fd7cd52e545b98f63c185d20ee9a4ef8aae55"
}
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.20.0-0.nightly-2025-10-02-162542"
"base": "4.20.0-0.nightly-2025-10-05-124915"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95680eb4c4c74e1abcf627e4cf58f55a1be81ae0c2f16fa819f738c59b74aaae",
Expand All @@ -9,7 +9,7 @@
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c37666c51f61a4580e4338c3dc2b74023efad2841b9a1f971e199d0d4c0b6ec",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7eb4b2915c31f1960b5dd77536e1b42a34776475a35b92a8f06c64c462a338f0",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9a52cacc48bf8657c9368c0ba0d854c3542794beb4ed21d114ad204c170eafa0",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae6485fac87a0090a3ff180b02e3d767c52fc8134fb8d7cc1b6a0624d5ee984c",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9563b22cacb976820e44b2a48073320fcf32fe30ec7832ff8ab33d80f121cf6",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:54bc30e4861f9734f6921389a7be5ba355e09c702bf7b6b8d1c81cf0330a6fc3"
}
Expand Down
15 changes: 4 additions & 11 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
- api embedded-component 491784f55cb31c550e9a82f13166d7e08d800ae9 to 41627d81e9c18fbcc3f7ff6de2ba50e0b98435c4
- 81c24c86 2025-09-26T14:28:39+00:00 Fix: Updated the printer column entry
- b3496f18 2025-09-25T19:08:54+00:00 Updated column type from string to date

- cluster-network-operator embedded-component 6a287ae0e3a52b664ac6dc5dfc4f2913d1d1ef2a to 222905435d8186385608b8bdb864e2a5c73406e0
- 2c65e91 2025-09-16T12:17:15+00:00 Add validation check for labels and test
- 2db750e 2025-09-16T12:17:15+00:00 Add documentation surrounding the Smart-NIC/DPU Host/DPU mode labels
- 0dc7fcc 2025-09-16T12:17:15+00:00 Relax label req. of DPU/DPU Host/Smart NIC

- machine-config-operator embedded-component c258b4ed3a457081e001c234ab289c5526572c64 to d707114bc07c40c63084de0f91748b2efda91739
- 9120a52f 2025-10-01T06:24:15+00:00 OCPBUGS-60805: configure-ovs: work around a Cisco switch issue
- machine-config-operator embedded-component d707114bc07c40c63084de0f91748b2efda91739 to 58f14fc5d33718cc2c6c38e51e05147a8303aba1
- 941c3279 2025-10-02T13:57:21+00:00 certcontroller: update unit tests
- 1203a83c 2025-10-02T13:57:21+00:00 certcontroller: resync on infra object
- b9b69935 2025-09-24T17:26:15+00:00 controller: update is node done check to handle image mode disabling case & add unit test cases for scenario

2 changes: 1 addition & 1 deletion scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 4260482
https://github.com/openshift/etcd embedded-component 9c065d4d842c8de57806426c13201413b4d595e2
https://github.com/openshift/kubernetes embedded-component e0d42164c84ee27644b85a1d2c9bbb062066056d
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 0f8a4eb84ace9b746cf25d51d80dacf34ca5f953
https://github.com/openshift/machine-config-operator embedded-component d707114bc07c40c63084de0f91748b2efda91739
https://github.com/openshift/machine-config-operator embedded-component 58f14fc5d33718cc2c6c38e51e05147a8303aba1
https://github.com/openshift/openshift-controller-manager embedded-component d9e543dd31e981f279c447e4f92f0dac3f665f9e
https://github.com/openshift/operator-framework-olm embedded-component 10d327b38876b2fbc654ddc54eee6199ea0dbbb8
https://github.com/openshift/route-controller-manager embedded-component bf2fa662f57f233d8541f94c4953e0dcd7a5ab20
Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash -x
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.20.0-0.nightly-2025-10-02-162542" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2025-10-02-190239"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.20.0-0.nightly-2025-10-05-124915" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2025-10-05-192559"