Skip to content

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2026-05-13-164455_amd64-2026-05-13_arm64-2026-05-13 #6670

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 14, 2026
Merged

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2026-05-13-164455_amd64-2026-05-13_arm64-2026-05-13 #6670

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
a1773a2
update last_rebase.sh
May 14, 2026
846d32f
update changelog
May 14, 2026
a393f3c
update component images
May 14, 2026
71651e0
update manifests
May 14, 2026
cf9d0eb
update buildfiles
May 14, 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.18.0-0.nightly-arm64-2026-05-11-021543
OCP_VERSION := 4.18.0-0.nightly-arm64-2026-05-13-232735
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.18.0-0.nightly-2026-05-10-201542
OCP_VERSION := 4.18.0-0.nightly-2026-05-13-164455
4 changes: 2 additions & 2 deletions assets/optional/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:5239f41c7575c285e1f64ed9effcdd1933978aa8b490d172d634490a5aed366f
digest: sha256:328ace5699a1ea539936d9b36f1447ab4bc8df6d953c95499c72b9dd4ccd5076
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:e8d44af7cf9a6537825ed45d5728a3f78d38c7cc2225cd859f3063e5a644c8f1
digest: sha256:625eedf542fe90f2b24ccfacfe936105e85dbbb31fc8d397ceb1ec22756013ac
6 changes: 3 additions & 3 deletions assets/optional/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.18.0-0.nightly-arm64-2026-05-11-021543"
"base": "4.18.0-0.nightly-arm64-2026-05-13-232735"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5239f41c7575c285e1f64ed9effcdd1933978aa8b490d172d634490a5aed366f",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8d44af7cf9a6537825ed45d5728a3f78d38c7cc2225cd859f3063e5a644c8f1"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:328ace5699a1ea539936d9b36f1447ab4bc8df6d953c95499c72b9dd4ccd5076",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:625eedf542fe90f2b24ccfacfe936105e85dbbb31fc8d397ceb1ec22756013ac"
}
}
2 changes: 1 addition & 1 deletion assets/optional/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.18.0-0.nightly-2026-05-10-201542"
"base": "4.18.0-0.nightly-2026-05-13-164455"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b894da705e0ba383443504701b4110ecdf5098581601f7393f60446c0fedf2b",
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:cc143030e7105e1dbc7f2eba5106d6c8e0a54e40b1382a34b1983df48291109d
digest: sha256:f52ab9807f58d5aa36a9547320569fc44b60d89b4dee4d347051a57865fedd9f
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:3e6310d99f1fa576292e46c1173ece1a01e3d506aa7748463d37f682c2cfec46
digest: sha256:60c404d82878a189972a4c41b3a9e586a90fecbdd98f3b4fa4d930f24c19b8ae
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:c7989695c15f10088861b70e2f6f31bfb5954d882de137e88d964aac9b1e9bec
digest: sha256:91fa894cf7f34bcdd13f4d25bbf9cb60981f88093f76c36fd3da408d7743858e

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:3e6310d99f1fa576292e46c1173ece1a01e3d506aa7748463d37f682c2cfec46
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:60c404d82878a189972a4c41b3a9e586a90fecbdd98f3b4fa4d930f24c19b8ae
- 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:cc143030e7105e1dbc7f2eba5106d6c8e0a54e40b1382a34b1983df48291109d
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f52ab9807f58d5aa36a9547320569fc44b60d89b4dee4d347051a57865fedd9f
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.18.0-0.nightly-arm64-2026-05-11-021543"
"base": "4.18.0-0.nightly-arm64-2026-05-13-232735"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc143030e7105e1dbc7f2eba5106d6c8e0a54e40b1382a34b1983df48291109d",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e6310d99f1fa576292e46c1173ece1a01e3d506aa7748463d37f682c2cfec46",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7989695c15f10088861b70e2f6f31bfb5954d882de137e88d964aac9b1e9bec"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f52ab9807f58d5aa36a9547320569fc44b60d89b4dee4d347051a57865fedd9f",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:60c404d82878a189972a4c41b3a9e586a90fecbdd98f3b4fa4d930f24c19b8ae",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:91fa894cf7f34bcdd13f4d25bbf9cb60981f88093f76c36fd3da408d7743858e"
}
}
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.18.0-0.nightly-2026-05-10-201542"
"base": "4.18.0-0.nightly-2026-05-13-164455"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:66f6a9bbdd24e7f6d1653cfdbcad28cc243793002308e1113095fbd1dc9f33b3",
Expand Down
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.18.0-0.nightly-arm64-2026-05-11-021543"
"base": "4.18.0-0.nightly-arm64-2026-05-13-232735"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1836005d98266af037e2bc0eddb2a65628d8ecaa87b1d671b848b0c1a5bc40c",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c1eef746b903f9413d67b626882fb617b20925abc65012c0f065de1cdf954f8",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9555f021b3a67ed9bbab4d790576efdf6b6b0ade72c82762fb17e94c60899b2d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7989695c15f10088861b70e2f6f31bfb5954d882de137e88d964aac9b1e9bec",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6fd18bb46e073ff938f74a8f43dfbe6c4155f947652f621c527770acfd050b1",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:18460fd76ca550a5c6f09e213ae7b319598e792bb4b1374a0352c102d3cd429f",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aaac216542e65fbd518ccecb4f19011fd0d9ac15839f195f5b0207589b1cf661",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e20e4684e4e403c263a38ab1865a0c14298567a754b6c6521d85e293fc20c975",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ee9d860ce9c7273471e08aa4dc2830ccc6cfca299a9a88889c58cbcffe8a0579",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a528353caeae5d0159565006ba8b3dc5b7793ad79c26929f8ea9acec850c3fe5",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:91fa894cf7f34bcdd13f4d25bbf9cb60981f88093f76c36fd3da408d7743858e",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01fa70bed4a1c1fffeebf0dbf08169f4a5d98887fdc93abbb740f894f808be4b",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1e2d77891be4d5c7bc9f7288981740b304d7353891bbcc3cb3903d05a465079",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0bcba13f936ce728d74d6d2c1b09956622aee677ed9bed3f27f1e48f5ffc5eb5",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:838f2f44d2cffb8784d6975e2c8048a6f22b045b19f65cb1932bd204acacf20d"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97c4153a11ea1d5a571e7c9b7ee0e24ac91e2de92cdb49fb7a4608f90d8e3b83"
}
}
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,13 +1,13 @@
{
"release": {
"base": "4.18.0-0.nightly-2026-05-10-201542"
"base": "4.18.0-0.nightly-2026-05-13-164455"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fae8d6f288aa9b4dc6812d572c1d2acc6cd4d85b17bf9d73fb723b2104f8708f",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc59b3d720c2e8240087d7bae474b618ad810d163afd2072bb9c95cf83dd71cc",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2804591b8bc70f5d4c8f94d722de4fb9d01de1bcf329c05b4a31577b6741bd4d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:236b716621a88efd57cdf6f704340fb2faf4583651ecbda524261e0b5a9b39cf",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f86d9b4cb9cefb2668331ffac8d59465569e8f0962dad02ff011bb38155e8080",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c4f9f69f15fb925664055c24a38b143eb4a7ad92864b4b2193a74d735c6f975",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ebcd6745e15ac3776016a78fc9882f5ca05f5f6afbb5edd97edd70377f667d1",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:187f9b0a3870f29230341708af35ab9befe217fb7d5c9c0aa663a365175b3f83",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
Expand Down
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 @@ -25,6 +25,6 @@ plugin_dirs = [
# 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:18460fd76ca550a5c6f09e213ae7b319598e792bb4b1374a0352c102d3cd429f"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1e2d77891be4d5c7bc9f7288981740b304d7353891bbcc3cb3903d05a465079"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
3 changes: 0 additions & 3 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
- cluster-network-operator embedded-component b40233991fa420432a44fba510d59fc24d3aafd7 to c836773db43651d272644c12d47a8d70a118c1d7
- a1c7c77 2026-05-01T15:45:29+00:00 wait for patch port to apply drop garp flows

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.18.0-0.nightly-2026-05-10-201542" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-05-11-021543"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2026-05-13-164455" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-05-13-232735"