Skip to content

NO-ISSUE: rebase-release-4.22-4.22.0-0.nightly-2026-01-14-031657_amd64-2026-01-14_arm64-2026-01-19 #6103

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 5 commits into from
Jan 19, 2026
Merged

NO-ISSUE: rebase-release-4.22-4.22.0-0.nightly-2026-01-14-031657_amd64-2026-01-14_arm64-2026-01-19 #6103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ba33add
update last_rebase.sh
Jan 19, 2026
6e22f21
update changelog
Jan 19, 2026
d3c7dfd
update component images
Jan 19, 2026
03d7052
update manifests
Jan 19, 2026
6f4e6c8
update buildfiles
Jan 19, 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-01-16-012506
OCP_VERSION := 4.22.0-0.nightly-arm64-2026-01-19-012506
4 changes: 2 additions & 2 deletions assets/components/multus/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: multus-cni-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:6cc8354ae22397bc2d52f3fc35bea7ed49392184a6bfb4ef522f98e71a184251
digest: sha256:e93b83310a1d41625739faad63c02f7fca2d28c2bf1e611ff73a96cda675c6db
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:43802f3ee739768c8f40ac924cb3df15fbfbfca21c8ab6005ddc65800e7fe3b0
digest: sha256:1f7fe41cc5064c13eba8c476346e974a55fc29e5797005f4a4866cfedee2fdce
6 changes: 3 additions & 3 deletions assets/components/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.22.0-0.nightly-arm64-2026-01-16-012506"
"base": "4.22.0-0.nightly-arm64-2026-01-19-012506"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6cc8354ae22397bc2d52f3fc35bea7ed49392184a6bfb4ef522f98e71a184251",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:43802f3ee739768c8f40ac924cb3df15fbfbfca21c8ab6005ddc65800e7fe3b0"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e93b83310a1d41625739faad63c02f7fca2d28c2bf1e611ff73a96cda675c6db",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f7fe41cc5064c13eba8c476346e974a55fc29e5797005f4a4866cfedee2fdce"
}
}
10 changes: 5 additions & 5 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,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:75edf3b7f577c551f90b24b571f98c2abd5d2fa4b1e8fdd83771d988292a79ff
digest: sha256:b5effb258331e53fe882935462bcb1cc8044ddbfb03985bb77973cf1ebedda73
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:fad8b47d92c679310045251008277f31652061c305db9ba165e776312fd11c3d
digest: sha256:0d4d2967cdde2d5481d53680c634c76b5f9622944c664d26f0a5d96c4407625e
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:256d6131d6dd8c071d3cd945798afc40a2cbf62347d7ae28b20e1a2335917521
digest: sha256:eda70ca394fd8960fa0befd53948e8be7d66acc54127ee3eaf05af57ee85655e

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fad8b47d92c679310045251008277f31652061c305db9ba165e776312fd11c3d
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d4d2967cdde2d5481d53680c634c76b5f9622944c664d26f0a5d96c4407625e
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75edf3b7f577c551f90b24b571f98c2abd5d2fa4b1e8fdd83771d988292a79ff
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b5effb258331e53fe882935462bcb1cc8044ddbfb03985bb77973cf1ebedda73
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 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,10 +1,10 @@
{
"release": {
"base": "4.22.0-0.nightly-arm64-2026-01-16-012506"
"base": "4.22.0-0.nightly-arm64-2026-01-19-012506"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75edf3b7f577c551f90b24b571f98c2abd5d2fa4b1e8fdd83771d988292a79ff",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fad8b47d92c679310045251008277f31652061c305db9ba165e776312fd11c3d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:256d6131d6dd8c071d3cd945798afc40a2cbf62347d7ae28b20e1a2335917521"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b5effb258331e53fe882935462bcb1cc8044ddbfb03985bb77973cf1ebedda73",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d4d2967cdde2d5481d53680c634c76b5f9622944c664d26f0a5d96c4407625e",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eda70ca394fd8960fa0befd53948e8be7d66acc54127ee3eaf05af57ee85655e"
}
}
18 changes: 9 additions & 9 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.22.0-0.nightly-arm64-2026-01-16-012506"
"base": "4.22.0-0.nightly-arm64-2026-01-19-012506"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af1a0337616d78fb8352827f5d282b938bd9739e779b4f157992feddf827bf0f",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99c8462acebcef0ef8922efdb5689f61c9a2e7c307b89b7e75d63228e9c4ae86",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c9eb4500dd1b8b1e1ecb2063e0138d732ae59c9f3577e0aff321469d2dcaaa67",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:256d6131d6dd8c071d3cd945798afc40a2cbf62347d7ae28b20e1a2335917521",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a22501e27a7c4192b99102f2b6f779288226e8afe7fc6432cee35ebae275e60b",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3433ebe7fc79a4d62d9fd57b130b552e504c53aa9cf6f57d06c73bd58b55c117",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af55c6ec47c3b56aded929e8e3ea9e6e7db729140e4bc5d780fb89152ca4fc29",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e32f4cdd504a9d06452b825e383378b70fd1ad3ac6a280f65ea55febe0038f68",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e598fe258bd2a07aa41e1cda8b67ed761c8ccc7c0a8a8d6ad471ea6085686a4e",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1dfda65c3d53a06df175b288a331804c405c6c4d3f26dac0e2c0d1f2a2999cfc",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eda70ca394fd8960fa0befd53948e8be7d66acc54127ee3eaf05af57ee85655e",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55b44ea6e6dc219a9398e274c0424cc636dcac5a719b39cb517900762c04e2dd",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:74a5c682facd8f1775c5bed51cfabc4841c47460e725eb808ec942de4f26dbe2",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8e9b86ed84ffd88e2be27acfc9169da4d0431046c5355b586aa7d4b5f8815a1c",
"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:68f2607c70abf8e28aa43b4c81e1c3f4a770ef63e73e7798ffccf2fe82cd6863"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75f9950c8e76b50034258fcb2c0fdabe6f8573982e40ffc686eeb92617acb8e3"
}
}
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_arm64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# for community builds on top of OKD, this setting has no effect
[crio.image]
global_auth_file="/etc/crio/openshift-pull-secret"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3433ebe7fc79a4d62d9fd57b130b552e504c53aa9cf6f57d06c73bd58b55c117"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:74a5c682facd8f1775c5bed51cfabc4841c47460e725eb808ec942de4f26dbe2"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
15 changes: 8 additions & 7 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
- csi-external-snapshotter image-arm64 6383ab93be114af8d1067523602bd2a44c927f1a to d20b90a92cd7d77166319f5bc2feb80623747d28
- 06ed333 2026-01-06T14:18:57+08:00 UPSTREAM: 1359: Fix group snapshot not taken on conflict
- 44323ca 2026-01-06T14:17:22+08:00 UPSTREAM: 1354: Fix for cases where the resource is already present on the cluster
- oc image-arm64 4df0e94abe472105343c5c132396fbfafa47c569 to 430c82293109e23f3caaf9ba60e5affd2d5356f5
- 4f7cc648 2026-01-16T09:12:56+03:00 Fix unit test failure by updating ruby version to 3.3

- router image-arm64 b5fcf0cd7f62a4eb76faa167cc9eca7e198fb5c9 to fa55e2723077811ef81c4b494c68f6c38282d6e2
- 9569f21 2025-12-20T13:59:35+00:00 Updating openshift-enterprise-haproxy-router-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/openshift-enterprise-haproxy-router.yml
- kubernetes image-arm64 581cfc7ee3313c212378878350aec16236e3f155 to e4a4167c40c9ed543c5a80f2e08cc73696f7a4f6
- 11bb75887 2026-01-16T10:25:44-05:00 UPSTREAM: 135340: cbor: bump limits
- a0f87aee4 2026-01-15T21:44:31+08:00 UPSTREAM: <carry>: change iperf2 test case from parallel into serial

- service-ca-operator image-arm64 b43ed91efd958355b8209bf252f901bb2213daf3 to bb522851659b55683ff29410ee1a300af1506926
- 35a06a2 2026-01-14T02:39:22+08:00 test/e2e: migrate vulnerable-legacy-ca-bundle-injection-configmap test for OTE compatibility
- service-ca-operator image-arm64 bb522851659b55683ff29410ee1a300af1506926 to 503e4f5f4c74fd095a8dca385541125f3c9ee28b
- aaba756 2026-01-16T15:51:27+08:00 test/e2e: migrate metrics tests for OTE compatibility
- c9f6639 2026-01-15T20:26:00+08:00 test/e2e: migrate headless-stateful-serving-cert-secret-delete-data test for OTE compatibility

6 changes: 3 additions & 3 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 cd636680e06a55395c26570
https://github.com/openshift/ovn-kubernetes image-amd64 1938041fd8f8c1fb5d376fa59faec1fef7614a92
https://github.com/openshift/kubernetes image-amd64 581cfc7ee3313c212378878350aec16236e3f155
https://github.com/openshift/service-ca-operator image-amd64 7c43fea353e9d13663e51e44788bf3c2ec737c1a
https://github.com/openshift/oc image-arm64 4df0e94abe472105343c5c132396fbfafa47c569
https://github.com/openshift/oc image-arm64 430c82293109e23f3caaf9ba60e5affd2d5356f5
https://github.com/openshift/coredns image-arm64 9798af8539c27ad02bd376006cd3a9a7b23e5966
https://github.com/openshift/csi-external-snapshotter image-arm64 d20b90a92cd7d77166319f5bc2feb80623747d28
https://github.com/openshift/router image-arm64 fa55e2723077811ef81c4b494c68f6c38282d6e2
https://github.com/openshift/kube-rbac-proxy image-arm64 cd636680e06a55395c26570dff0cb37277014388
https://github.com/openshift/ovn-kubernetes image-arm64 1938041fd8f8c1fb5d376fa59faec1fef7614a92
https://github.com/openshift/kubernetes image-arm64 581cfc7ee3313c212378878350aec16236e3f155
https://github.com/openshift/service-ca-operator image-arm64 bb522851659b55683ff29410ee1a300af1506926
https://github.com/openshift/kubernetes image-arm64 e4a4167c40c9ed543c5a80f2e08cc73696f7a4f6
https://github.com/openshift/service-ca-operator image-arm64 503e4f5f4c74fd095a8dca385541125f3c9ee28b
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-01-14-031657" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-01-16-012506"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-01-14-031657" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-01-19-012506"