Skip to content

NO-ISSUE: rebase-release-4.22-4.22.0-0.nightly-2026-04-18-162844_amd64-2026-04-18_arm64-2026-04-19 #6534

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
Apr 20, 2026
Merged

NO-ISSUE: rebase-release-4.22-4.22.0-0.nightly-2026-04-18-162844_amd64-2026-04-18_arm64-2026-04-19 #6534

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
218c64d
update last_rebase.sh
Apr 20, 2026
239ac9b
update changelog
Apr 20, 2026
3433496
update manifests
Apr 20, 2026
6b5db3c
update buildfiles
Apr 20, 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
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.22.0-0.nightly-arm64-2026-04-16-224605
OCP_VERSION := 4.22.0-0.nightly-arm64-2026-04-19-224615
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.22.0-0.nightly-2026-04-16-071953
OCP_VERSION := 4.22.0-0.nightly-2026-04-18-162844
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.22.0-0.nightly-arm64-2026-04-16-224605"
"base": "4.22.0-0.nightly-arm64-2026-04-19-224615"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b5dea1a4af066d607b01598dfd50e061d9c2e3d65f8c30c1bd3abb056b33152",
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.22.0-0.nightly-2026-04-16-071953"
"base": "4.22.0-0.nightly-2026-04-18-162844"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:620e86eea28e099908f35345f5e8293abc223c4eb3a84d108eeb9e41e8f5b897",
Expand Down
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.22.0-0.nightly-arm64-2026-04-16-224605"
"base": "4.22.0-0.nightly-arm64-2026-04-19-224615"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ffe14ab720dcf34fdb9bdcfab9e0c7819ed10de29235aa2a3d42de4ed83ba0f",
Expand Down
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.22.0-0.nightly-2026-04-16-071953"
"base": "4.22.0-0.nightly-2026-04-18-162844"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e12533297ded98f646a858e554b51d82df668db5f174b5dbaf8535357a55a45",
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,11 +1,11 @@
{
"release": {
"base": "4.22.0-0.nightly-arm64-2026-04-16-224605"
"base": "4.22.0-0.nightly-arm64-2026-04-19-224615"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96c2ca56b7adee081586d205524adfed461168f1e0a40fd3b8038083fd77d43d",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c91239cf00f8f823d77384fd65c8a1118fbfd3ce76ff919fdd6ac5eec6b2b14f",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:37e5d15a185322a5961620cd6f5e66a3ef885e1452dbafba848ad441496d5b5d",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6fdcd800bd3ed61004096ea6a663d30ac97f86d1f8d701e7a0249de58c503c5",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1212a6316a0a1fd59123abbc120817a05c8686b7d5caf7db9d0f48ba1530a0fe",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19a860a1239cac2288a26bbe11dedbdb2b625fc07800b4ffc0157609acfad3b6",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99b7c7acfd8f94be5b810f7f4c835667c6c8d09303fd0a24b4648ffbeeaeaabe",
Expand Down
8 changes: 4 additions & 4 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"release": {
"base": "4.22.0-0.nightly-2026-04-16-071953"
"base": "4.22.0-0.nightly-2026-04-18-162844"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48030f3a916d765b49a8986f8251fc5fc40f501b2bd05843279bd61358304e33",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d581acf8ff9415b78cb3a72342183ebd6404138484187723319253326615f05",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ba63800d7599664c73936321042e2787aafecddbe607843ae8c91f7f5faf7497",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:88946b2dcc48392eeaf306b49ff9a6f320e7c2fd80c8c2e5a25d4392de05a7c5",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1512b7dc1aadec4125ff383c8376bcd6939862e3519db2ae1b0879ebf661369e",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dee202ae1d67cdcf9771d0dbdf552d2306d8964fca12316966966a5e3da5f76d",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb264c1f152e490c78ffa59f8e7c2b2d5184da2acdc1b3e4759bec959bf9c537",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d7ff3a28b5422dbd93d4b693b9c16ed4113665103c9ae4c9e2c4d9d8f4727a6",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c244a9c834031b2eabb0986540fc97dc7ec5ec1a19d0e655b99c9cafca146ad8",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40124633cb9fc4f1b98a9ac920cfaaae146bf638291b03a55cb6f522c7e325bf",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee",
Expand Down
10 changes: 7 additions & 3 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
- api embedded-component 464776f9520793f0f20645fbcb82d945abb0a05b to b37d107c490a35659457ed38f9f5b109f85448da
- c90338d3 2026-04-14T14:35:24-04:00 features: disable psa
- machine-config-operator embedded-component 449e78f7ec941d8db237da39ccce2095912fea43 to eadf8329c93aba9b187de7668ec3e469bc6d168e
- a152664a 2026-04-16T06:05:37Z chore: update AMIs
- 85109ddb 2026-04-15T17:31:52Z Bug OCPEDGE-2447: fix filename collision in ovs-configuration drop-in
- e08af2ec 2026-04-15T17:31:52Z Bug OCPEDGE-2447: prevent configure-ovs.sh re-execution within same boot
- bf61c18f 2026-04-15T17:31:52Z Bug OCPEDGE-2447: order corosync after OVS configuration on TNF clusters
- 1a6b213d 2026-04-15T14:29:02+02:00 Revert "Merge pull request #5797 from mkowalski/more-cpu-for-ovs"

- ovn-kubernetes image-arm64 e327d43ff04f410b1d9f301a6484af5359a98d3d to 14b5022bad5b21334e3ad9d500763474016b2a9c
- ovn-kubernetes image-amd64 e327d43ff04f410b1d9f301a6484af5359a98d3d to 14b5022bad5b21334e3ad9d500763474016b2a9c
- 68ccf1f1 2026-04-15T08:59:44Z openshift tests: disable
- f6098fc2 2026-04-15T08:58:44Z openshift tests: demote to informing

4 changes: 2 additions & 2 deletions 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 d1bc3ff
https://github.com/openshift/etcd embedded-component d8d67b8ce849f816d6d23c904098336632e2348f
https://github.com/openshift/kubernetes embedded-component 9193b12ab88e006723c8605bea1659bfcbe7d638
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 72835e43c7754356645e41031f3a99926b4d42e6
https://github.com/openshift/machine-config-operator embedded-component 449e78f7ec941d8db237da39ccce2095912fea43
https://github.com/openshift/machine-config-operator embedded-component eadf8329c93aba9b187de7668ec3e469bc6d168e
https://github.com/openshift/openshift-controller-manager embedded-component 26d20feae8892f648f5b06ed3f5492fe6ffb4532
https://github.com/openshift/operator-framework-olm embedded-component e627823c743797da91b4ae8a318d2420a511b752
https://github.com/openshift/route-controller-manager embedded-component 624742d93f3a7885cf7f70985f1e23ff60da580d
Expand All @@ -22,7 +22,7 @@ https://github.com/openshift/coredns image-amd64 0dded2d232dab43c107b1dab9d0d9fd
https://github.com/openshift/csi-external-snapshotter image-amd64 d1bc3ffaa9759c13a06c2ec61c541342e71bd109
https://github.com/openshift/router image-amd64 896390778ebe15f57f87e6ca78f11c96e64c2652
https://github.com/openshift/kube-rbac-proxy image-amd64 d12e274605248f6c59373240a7eae7a7a357dcb3
https://github.com/openshift/ovn-kubernetes image-amd64 e327d43ff04f410b1d9f301a6484af5359a98d3d
https://github.com/openshift/ovn-kubernetes image-amd64 14b5022bad5b21334e3ad9d500763474016b2a9c
https://github.com/openshift/kubernetes image-amd64 9193b12ab88e006723c8605bea1659bfcbe7d638
https://github.com/openshift/service-ca-operator image-amd64 7b3033bba87d7b40684b66f8f44a3525433d1ac7
https://github.com/openshift/oc image-arm64 66dee73f66c4f048c333c6a77d76871872027896
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.22.0-0.nightly-2026-04-16-071953" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-04-16-224605"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-04-18-162844" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-04-19-224615"