Skip to content

NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2026-04-22-115050_amd64-2026-04-22_arm64-2026-04-24 #6585

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 6 commits into from
Apr 27, 2026
Merged

NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2026-04-22-115050_amd64-2026-04-22_arm64-2026-04-24 #6585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d72a3c4
update last_rebase.sh
Apr 27, 2026
c008ae9
update changelog
Apr 27, 2026
afd4121
update component images
Apr 27, 2026
94c7beb
update manifests
Apr 27, 2026
7fd7965
update buildfiles
Apr 27, 2026
6aa77b1
Update AI Model Serving for MicroShift
Apr 27, 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.20.0-0.nightly-arm64-2026-04-22-115035
OCP_VERSION := 4.20.0-0.nightly-arm64-2026-04-24-130051
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:5b7e89fddece963f8068a45aefc16163455cc98da99ead596b0d1e881ab60429
digest: sha256:7e2210ccc723724ebd697c4b951f58dc7c0683fd3d207ab6b4a6fe26d0a880c6
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:3aec381e01b6686610bbf61fa9f5a1532d117ac1e01145dcd8a179c7f80fe488
digest: sha256:675708cc765fa2f22a35720f0143dc23ecf49b8bc15b611fa1103a037b9cbcae
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.20.0-0.nightly-arm64-2026-04-22-115035"
"base": "4.20.0-0.nightly-arm64-2026-04-24-130051"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b7e89fddece963f8068a45aefc16163455cc98da99ead596b0d1e881ab60429",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3aec381e01b6686610bbf61fa9f5a1532d117ac1e01145dcd8a179c7f80fe488"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e2210ccc723724ebd697c4b951f58dc7c0683fd3d207ab6b4a6fe26d0a880c6",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:675708cc765fa2f22a35720f0143dc23ecf49b8bc15b611fa1103a037b9cbcae"
}
}
2 changes: 1 addition & 1 deletion ...s/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_clusterservingruntimes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.2
controller-gen.kubebuilder.io/version: v0.17.0
name: clusterservingruntimes.serving.kserve.io
spec:
group: serving.kserve.io
Expand Down
2 changes: 1 addition & 1 deletion ...optional/ai-model-serving/kserve/crd/full/serving.kserve.io_clusterstoragecontainers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.2
controller-gen.kubebuilder.io/version: v0.17.0
name: clusterstoragecontainers.serving.kserve.io
spec:
group: serving.kserve.io
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_inferencegraphs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.2
controller-gen.kubebuilder.io/version: v0.17.0
name: inferencegraphs.serving.kserve.io
spec:
group: serving.kserve.io
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_inferenceservices.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.2
controller-gen.kubebuilder.io/version: v0.17.0
name: inferenceservices.serving.kserve.io
spec:
group: serving.kserve.io
Expand Down
2 changes: 1 addition & 1 deletion ...tional/ai-model-serving/kserve/crd/full/serving.kserve.io_llminferenceserviceconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.2
controller-gen.kubebuilder.io/version: v0.17.0
name: llminferenceserviceconfigs.serving.kserve.io
spec:
group: serving.kserve.io
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_llminferenceservices.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.2
controller-gen.kubebuilder.io/version: v0.17.0
name: llminferenceservices.serving.kserve.io
spec:
group: serving.kserve.io
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_localmodelcaches.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.2
controller-gen.kubebuilder.io/version: v0.17.0
name: localmodelcaches.serving.kserve.io
spec:
group: serving.kserve.io
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_localmodelnodegroups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.2
controller-gen.kubebuilder.io/version: v0.17.0
name: localmodelnodegroups.serving.kserve.io
spec:
group: serving.kserve.io
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_localmodelnodes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.2
controller-gen.kubebuilder.io/version: v0.17.0
name: localmodelnodes.serving.kserve.io
spec:
group: serving.kserve.io
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_servingruntimes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.2
controller-gen.kubebuilder.io/version: v0.17.0
name: servingruntimes.serving.kserve.io
spec:
group: serving.kserve.io
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_trainedmodels.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.2
controller-gen.kubebuilder.io/version: v0.17.0
name: trainedmodels.serving.kserve.io
spec:
group: serving.kserve.io
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "2.25.4"
"base": "2.25.6"
},
"images": {
"ray-tls-generator-image": "registry.redhat.io/ubi9/ubi-minimal:latest",
Expand Down
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:04624ecda7bb429bca4b1522707679d66e89ea467e7fbba2d1d8dac0d839f50c
digest: sha256:6da739d9833c9eb1b64dcfff503caa1bf84e65c1c7b4899af3e35202991e8bec
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:6feafc09b237e9019e9898c8fa9d117ba4115b2a0a1853b473e1aa0f1e8807c7
digest: sha256:a9c281c0a1d8193dc1c6a84185fbef1f2de10509ba02b17c10067f3072686f0f
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:00236f1bb8bda3cb5020b05403332c69fc3c08f0fac959d2bc9849ee7346fc5a
digest: sha256:a77dc4fd7320407ba71b94803e5348e45ede5337a983bb93c6e5f0b79761ac46

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:6feafc09b237e9019e9898c8fa9d117ba4115b2a0a1853b473e1aa0f1e8807c7
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9c281c0a1d8193dc1c6a84185fbef1f2de10509ba02b17c10067f3072686f0f
- 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:04624ecda7bb429bca4b1522707679d66e89ea467e7fbba2d1d8dac0d839f50c
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6da739d9833c9eb1b64dcfff503caa1bf84e65c1c7b4899af3e35202991e8bec
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.20.0-0.nightly-arm64-2026-04-22-115035"
"base": "4.20.0-0.nightly-arm64-2026-04-24-130051"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04624ecda7bb429bca4b1522707679d66e89ea467e7fbba2d1d8dac0d839f50c",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6feafc09b237e9019e9898c8fa9d117ba4115b2a0a1853b473e1aa0f1e8807c7",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00236f1bb8bda3cb5020b05403332c69fc3c08f0fac959d2bc9849ee7346fc5a"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6da739d9833c9eb1b64dcfff503caa1bf84e65c1c7b4899af3e35202991e8bec",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9c281c0a1d8193dc1c6a84185fbef1f2de10509ba02b17c10067f3072686f0f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a77dc4fd7320407ba71b94803e5348e45ede5337a983bb93c6e5f0b79761ac46"
}
}
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.20.0-0.nightly-arm64-2026-04-22-115035"
"base": "4.20.0-0.nightly-arm64-2026-04-24-130051"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:710cfbe81b0ed02505be560d6455a74a054a30c854aecef0ce8dae7732041fb2",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c59d51778efd170a665d4a6197eaaa5a91431684a10627354f852422ac6ff9dd",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:660156c74919a7308325b4a28b2df7a8dcbc36e90e12109b75ce5ec4f88a11a9",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00236f1bb8bda3cb5020b05403332c69fc3c08f0fac959d2bc9849ee7346fc5a",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d6e1f957c6a5e6008ff71e7cac5fe4aa8ea28f8ddca046367cd5d01ed69a6ec",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8674b34aada7680403141f3aa3a17cf323c21027a951f30b0fbef1940c864ff8",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e03a62014a674bbc36e68c45e8681cc36550e1c1767740e18d4182535b0f2b7a",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:390ddc4e615d838f9165ed14b3de0e9646c8a9d4252583f0b0425c2d09a0af37",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:29aa72ce526693b6f6265fa2dc01c829a4b63b3993c936b9b5a63c2d9db6a0dd",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1db91f8686ae6edef3bf24f6a67c41cd97e10de1a0e3575a2a07aac4ee731f59",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a77dc4fd7320407ba71b94803e5348e45ede5337a983bb93c6e5f0b79761ac46",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65bd5763c024604e8bc3f83ce49227553f0a8d92bd598faf5c0d6d50faebdbe8",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:60543f3abd3724017cb6bfea69588f6beaabfd708b15674e5d4d5f79c3406f72",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:175249cec0356bf24b62227f0089c0b41e892c6da01de7d9a69ec4c0bf2b9f80",
"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:d49051b0f2fee9c801ea0972577443e90c4274898faab74afa827f5731629808"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b19ea23788f4ad2e006c44a652452859b56eb822da5e743052bd4687b207eba"
}
}
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:8674b34aada7680403141f3aa3a17cf323c21027a951f30b0fbef1940c864ff8"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:60543f3abd3724017cb6bfea69588f6beaabfd708b15674e5d4d5f79c3406f72"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
9 changes: 7 additions & 2 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
- cluster-csi-snapshot-controller-operator embedded-component 019abe0c7671962829eb91269e1d76916966320e to a99bd8ffb9aa596fa8d6932d5d93e0613c5d367f
- 0c1c172 2026-04-15T12:46:46Z Fix PDB unhealthyPodEvictionPolicy field name
- oc image-arm64 64e778a55fbcdf295b671a7d4e701e7c8cc3a499 to 92a3a166a7f710a344a11bda0ad221e54583fccd
- 6c98139d 2026-02-23T18:59:56Z OCPBUGS-76394: Install subscription-manager in cli image
- 83999321 2026-02-23T18:59:56Z images/tools: Install subscription-manager
- 79716e32 2026-02-23T18:59:56Z OCPBUGS-76394: Ignore group ownership on rpm -V

- ovn-kubernetes image-arm64 b8b321eb5f64e9ea776d56e5bec3e5d5bd1ef5b3 to 84bbd555d1b9c16f8eb34b0de1c90d68328def94
- 8df3403f 2026-04-15T09:39:23Z Backport: Fix NAD Controller syncAll for networkID upgrade from node->NAD

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 @@ -25,11 +25,11 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 b9134351be37c4340833404
https://github.com/openshift/ovn-kubernetes image-amd64 b8b321eb5f64e9ea776d56e5bec3e5d5bd1ef5b3
https://github.com/openshift/kubernetes image-amd64 2d92ab7b3cb444e41ec6d5edf64dfe3b22d93142
https://github.com/openshift/service-ca-operator image-amd64 37e0c31790b6a954214817974a56c9a699d0cf78
https://github.com/openshift/oc image-arm64 64e778a55fbcdf295b671a7d4e701e7c8cc3a499
https://github.com/openshift/oc image-arm64 92a3a166a7f710a344a11bda0ad221e54583fccd
https://github.com/openshift/coredns image-arm64 6f39336e6da9dc77b2db140a96773c413d50a665
https://github.com/openshift/csi-external-snapshotter image-arm64 42604822c25eb2aa0ecb017c24e328221b238eb9
https://github.com/openshift/router image-arm64 3c365cad8c7037e4aa64a694994ea393abc4d9a2
https://github.com/openshift/kube-rbac-proxy image-arm64 b9134351be37c43408334047d8eb85d0ac01fe4e
https://github.com/openshift/ovn-kubernetes image-arm64 b8b321eb5f64e9ea776d56e5bec3e5d5bd1ef5b3
https://github.com/openshift/ovn-kubernetes image-arm64 84bbd555d1b9c16f8eb34b0de1c90d68328def94
https://github.com/openshift/kubernetes image-arm64 2d92ab7b3cb444e41ec6d5edf64dfe3b22d93142
https://github.com/openshift/service-ca-operator image-arm64 37e0c31790b6a954214817974a56c9a699d0cf78
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-2026-04-22-115050" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2026-04-22-115035"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.20.0-0.nightly-2026-04-22-115050" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2026-04-24-130051"