Skip to content

NO-ISSUE: rebase-release-5.0-5.0.0-0.nightly-2026-05-12-025124_amd64-2026-05-12_arm64-2026-05-18 #6687

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
May 18, 2026
Merged

NO-ISSUE: rebase-release-5.0-5.0.0-0.nightly-2026-05-12-025124_amd64-2026-05-12_arm64-2026-05-18 #6687

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
08222b8
update last_rebase.sh
May 18, 2026
e43ab69
update changelog
May 18, 2026
1c043cf
update component images
May 18, 2026
ef56ecb
update manifests
May 18, 2026
4cd0c80
update buildfiles
May 18, 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 := 5.0.0-0.nightly-arm64-2026-05-15-005007
OCP_VERSION := 5.0.0-0.nightly-arm64-2026-05-18-005007
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-v5.0-art-dev
digest: sha256:3511597fe2f87decb97d6ac9c897d834c75e43d1aa8326304a02a34d73c9fb21
digest: sha256:93dbdd59d85e2231e196d72da79450a884eb12d324fa81dc25b59a3869e8d24d
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:b67578f40eff97791bbec720112c6c9a69d3df2749b2692a854762c88ba58759
digest: sha256:07a060bd86ada655d2d1872528ee67779b9f11fb05c45eb7e2b760f7ce1c6f6b
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": "5.0.0-0.nightly-arm64-2026-05-15-005007"
"base": "5.0.0-0.nightly-arm64-2026-05-18-005007"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3511597fe2f87decb97d6ac9c897d834c75e43d1aa8326304a02a34d73c9fb21",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b67578f40eff97791bbec720112c6c9a69d3df2749b2692a854762c88ba58759"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:93dbdd59d85e2231e196d72da79450a884eb12d324fa81dc25b59a3869e8d24d",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:07a060bd86ada655d2d1872528ee67779b9f11fb05c45eb7e2b760f7ce1c6f6b"
}
}
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-v5.0-art-dev
digest: sha256:9069fe662e646e9fd267a232ebc17215ae8577a647e9e76bedaee92cf5b9876a
digest: sha256:abd495c16d1d983a1ae2cade07b2488be8f3177bf51b49367c089328f00ac908
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:4b5a2d8c6cec5508b80485d08b35bcdb4ba8cb90ead4df1bc0d2157ee9f1bb17
digest: sha256:b81731f5967aaa63b4cec433c859993f15e44037af51bc68055f9c026746d3c8
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:9692a5bc34b3a90acba7addd9d19412dc75ec134d5970c58d564f9809306fd6e
digest: sha256:0d6a1c6ebba722e09ff2850010cb8114a8d097ccee1198c1f59680c8c7581d48

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:4b5a2d8c6cec5508b80485d08b35bcdb4ba8cb90ead4df1bc0d2157ee9f1bb17
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b81731f5967aaa63b4cec433c859993f15e44037af51bc68055f9c026746d3c8
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9069fe662e646e9fd267a232ebc17215ae8577a647e9e76bedaee92cf5b9876a
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:abd495c16d1d983a1ae2cade07b2488be8f3177bf51b49367c089328f00ac908
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": "5.0.0-0.nightly-arm64-2026-05-15-005007"
"base": "5.0.0-0.nightly-arm64-2026-05-18-005007"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9069fe662e646e9fd267a232ebc17215ae8577a647e9e76bedaee92cf5b9876a",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:4b5a2d8c6cec5508b80485d08b35bcdb4ba8cb90ead4df1bc0d2157ee9f1bb17",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9692a5bc34b3a90acba7addd9d19412dc75ec134d5970c58d564f9809306fd6e"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:abd495c16d1d983a1ae2cade07b2488be8f3177bf51b49367c089328f00ac908",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b81731f5967aaa63b4cec433c859993f15e44037af51bc68055f9c026746d3c8",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0d6a1c6ebba722e09ff2850010cb8114a8d097ccee1198c1f59680c8c7581d48"
}
}
16 changes: 8 additions & 8 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": "5.0.0-0.nightly-arm64-2026-05-15-005007"
"base": "5.0.0-0.nightly-arm64-2026-05-18-005007"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:00939db3d205c214fb5e84e1d68a7bcff3771c6c102123605a299662725b7a7c",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:523aab23549547150754d78d15be5107475b92a9f360e83a9e43446450c80f72",
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0d6326a9545c73331c0bf69abef5788f3386613d0e478eda4a8df9a11154b1f8",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b0ba4204d533ef88359e60d61a4e42ecd07c4bfa0d256572c5bebb131708245b",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:023ba77301775562ee2c816ab1c1a7aa487f236c57e0dd1f10a9bdb0ca9753bf",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9692a5bc34b3a90acba7addd9d19412dc75ec134d5970c58d564f9809306fd6e",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0724411932e896d60057e4029f79764ddc150752bcf4f30d4aa083f7eec437ec",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:da819ec33e1395af1d9c30a1035fccc160df956af01428c57e3bba4e2618613c",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:444a13287828584480259887e9514b826b70e43882d2cca0a1cce0607d7fd230",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0d6a1c6ebba722e09ff2850010cb8114a8d097ccee1198c1f59680c8c7581d48",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:ae65312801b5023c8096ff09f403def6b907bfd906e62a8381a99fd69d85b9f4",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8f1f8a7f2bca9e349f62ec6655c9763a7cd24c838e878162d81c145e5e770eec",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:84991eb546767c906f1fb0b57ea7a312b616c8dedbc14dbb2a73c1b524b03e2d",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1659babe1a49cd841965f7010db3ddde1aae2c269d7470250172c7c48ad1ee1c"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a4b3317bed4c014345d2affe1afad35197136f9654727705ac307a6ee44b47fc"
}
}
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-v5.0-art-dev@sha256:da819ec33e1395af1d9c30a1035fccc160df956af01428c57e3bba4e2618613c"
pause_image = "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8f1f8a7f2bca9e349f62ec6655c9763a7cd24c838e878162d81c145e5e770eec"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
3 changes: 3 additions & 0 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- oc image-arm64 47f74288357be80d716e77e688a1a20278ef3c35 to a052bd4018333201e48f7370b2263db2dc6a5c99
- a052bd40 2026-05-15T18:47:14Z RFE-5434: Add cluster ID and timestamp to must-gather directory name (#2252)

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 @@ -25,7 +25,7 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 d12e274605248f6c5937324
https://github.com/openshift/ovn-kubernetes image-amd64 22e9487ee7060a85cfe20886b73e11fce3249e36
https://github.com/openshift/kubernetes image-amd64 f9b62a69d4a05e10b2b7cf8d40afa37f9dcd0938
https://github.com/openshift/service-ca-operator image-amd64 e7ccfa308e69ce4ad1f2afcd1d7c8ff25144374b
https://github.com/openshift/oc image-arm64 47f74288357be80d716e77e688a1a20278ef3c35
https://github.com/openshift/oc image-arm64 a052bd4018333201e48f7370b2263db2dc6a5c99
https://github.com/openshift/coredns image-arm64 0dded2d232dab43c107b1dab9d0d9fdfd8259622
https://github.com/openshift/csi-external-snapshotter image-arm64 3219da7dcbb14fa762704746d21fb38131beb1f4
https://github.com/openshift/router image-arm64 b75bab261392d5eacb115db408f121618a23e41d
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-5:5.0.0-0.nightly-2026-05-12-025124" "registry.ci.openshift.org/ocp-arm64/release-5-arm64:5.0.0-0.nightly-arm64-2026-05-15-005007"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release-5:5.0.0-0.nightly-2026-05-12-025124" "registry.ci.openshift.org/ocp-arm64/release-5-arm64:5.0.0-0.nightly-arm64-2026-05-18-005007"