Skip to content

NO-ISSUE: rebase-release-5.0-5.0.0-0.nightly-2026-05-07-114403_amd64-2026-05-07_arm64-2026-05-07 #6637

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

Open
microshift-rebase-script wants to merge 6 commits into
base: main
Choose a base branch
from
Open

NO-ISSUE: rebase-release-5.0-5.0.0-0.nightly-2026-05-07-114403_amd64-2026-05-07_arm64-2026-05-07 #6637

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
16bc314
update last_rebase.sh
May 8, 2026
c3b561f
update changelog
May 8, 2026
3cc1333
update etcd/vendor
May 8, 2026
de98652
update component images
May 8, 2026
a8fd236
update manifests
May 8, 2026
3dd7dc4
update buildfiles
May 8, 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-06-233705
OCP_VERSION := 5.0.0-0.nightly-arm64-2026-05-07-233705
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 := 5.0.0-0.nightly-2026-05-05-231020
OCP_VERSION := 5.0.0-0.nightly-2026-05-07-114403
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:39553f8b8ee836be1f442665fc55be7642261b7766f4b2fff0b30718abc9dae2
digest: sha256:0419b8946da554100869c1d2cab4f568cd7287d57b6e01558998a1dbb9422efc
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:6cbb31dceaec7a3fd771c614b804176e0947bc4e5278e3af167b9b1ba744e740
digest: sha256:96bffbb8d7f3efd742853a424e730e70fdb4889d0628f072db19039cbaaa70e6
4 changes: 2 additions & 2 deletions assets/components/multus/kustomization.x86_64.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:9e3d2bea43fd760020304e1b77e4d8b22c1effb0c575bb00efda8ce4c73f0ead
digest: sha256:f1dfb635e62215c6b02d70ee5c5da7892876f2dd9b9291447f78a219f6cf8080
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:12943ba669bad24ae74176906654bd96b46827714f7e0bb46db338d920215ede
digest: sha256:d397da631df1f1b257b682088d85961d656ca69edb02257b99d4929a222a0440
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-06-233705"
"base": "5.0.0-0.nightly-arm64-2026-05-07-233705"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:39553f8b8ee836be1f442665fc55be7642261b7766f4b2fff0b30718abc9dae2",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6cbb31dceaec7a3fd771c614b804176e0947bc4e5278e3af167b9b1ba744e740"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0419b8946da554100869c1d2cab4f568cd7287d57b6e01558998a1dbb9422efc",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:96bffbb8d7f3efd742853a424e730e70fdb4889d0628f072db19039cbaaa70e6"
}
}
6 changes: 3 additions & 3 deletions assets/components/multus/release-multus-x86_64.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-2026-05-05-231020"
"base": "5.0.0-0.nightly-2026-05-07-114403"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9e3d2bea43fd760020304e1b77e4d8b22c1effb0c575bb00efda8ce4c73f0ead",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:12943ba669bad24ae74176906654bd96b46827714f7e0bb46db338d920215ede"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f1dfb635e62215c6b02d70ee5c5da7892876f2dd9b9291447f78a219f6cf8080",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d397da631df1f1b257b682088d85961d656ca69edb02257b99d4929a222a0440"
}
}
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:882318cac95ca934668849dcd7d5da9a9198c968c6b561ac9bb43b28c5454ff2
digest: sha256:cb1a4757e20b4212972f1626e007f7eca05de56252d4127db38cdb0e05801134
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:cf89dd206b52c7bb704d6609e90d47fe116a68bcf5c6e20525bebf9fe2d9b370
digest: sha256:29e2d6d0dcb07e52a511195107f2ae607a40694cf652577b6a0064b6d741729d
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:0446463c285378b96336a9bcfdc1560181ceb3c2c2c9d0e1274c4978d043a10e
digest: sha256:1ed9257b8ee67cac5f75a6cb8ff80ff99e44bf67e2864b1fb7a7a09c34d5bdb6

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:cf89dd206b52c7bb704d6609e90d47fe116a68bcf5c6e20525bebf9fe2d9b370
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:29e2d6d0dcb07e52a511195107f2ae607a40694cf652577b6a0064b6d741729d
- 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:882318cac95ca934668849dcd7d5da9a9198c968c6b561ac9bb43b28c5454ff2
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cb1a4757e20b4212972f1626e007f7eca05de56252d4127db38cdb0e05801134
target:
kind: Deployment
labelSelector: app=catalog-operator
10 changes: 5 additions & 5 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.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:9af145c15f17fbc08ff3490c71e6a69fdb364914be5ae3c3cf0498d55cbc40c9
digest: sha256:bcb13a1695726b8f68dadb3a0c2411f7acdac47cbdea29759da5bff4214e5b8f
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:bc549adfc831847203871fe9ebd1a4c9f54ab5f94843a3c4f20c9f9553984767
digest: sha256:fec8a43ec565361b34881820e5322d15711a313463f4b25fcf5d48eef4c4c9dd
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:3482ea3d2b8dce334f07b89086fdb06543d1a1680b4e71f937fbd13a171c42cf
digest: sha256:8222e4f74bbfa6138b29668f3c54d4df920a9ff67cfefca877bb9932cfc65ae9

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:bc549adfc831847203871fe9ebd1a4c9f54ab5f94843a3c4f20c9f9553984767
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:fec8a43ec565361b34881820e5322d15711a313463f4b25fcf5d48eef4c4c9dd
- 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:9af145c15f17fbc08ff3490c71e6a69fdb364914be5ae3c3cf0498d55cbc40c9
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:bcb13a1695726b8f68dadb3a0c2411f7acdac47cbdea29759da5bff4214e5b8f
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-06-233705"
"base": "5.0.0-0.nightly-arm64-2026-05-07-233705"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:882318cac95ca934668849dcd7d5da9a9198c968c6b561ac9bb43b28c5454ff2",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cf89dd206b52c7bb704d6609e90d47fe116a68bcf5c6e20525bebf9fe2d9b370",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0446463c285378b96336a9bcfdc1560181ceb3c2c2c9d0e1274c4978d043a10e"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cb1a4757e20b4212972f1626e007f7eca05de56252d4127db38cdb0e05801134",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:29e2d6d0dcb07e52a511195107f2ae607a40694cf652577b6a0064b6d741729d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1ed9257b8ee67cac5f75a6cb8ff80ff99e44bf67e2864b1fb7a7a09c34d5bdb6"
}
}
8 changes: 4 additions & 4 deletions 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,10 +1,10 @@
{
"release": {
"base": "5.0.0-0.nightly-2026-05-05-231020"
"base": "5.0.0-0.nightly-2026-05-07-114403"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9af145c15f17fbc08ff3490c71e6a69fdb364914be5ae3c3cf0498d55cbc40c9",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:bc549adfc831847203871fe9ebd1a4c9f54ab5f94843a3c4f20c9f9553984767",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3482ea3d2b8dce334f07b89086fdb06543d1a1680b4e71f937fbd13a171c42cf"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:bcb13a1695726b8f68dadb3a0c2411f7acdac47cbdea29759da5bff4214e5b8f",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:fec8a43ec565361b34881820e5322d15711a313463f4b25fcf5d48eef4c4c9dd",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8222e4f74bbfa6138b29668f3c54d4df920a9ff67cfefca877bb9932cfc65ae9"
}
}
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": "5.0.0-0.nightly-arm64-2026-05-06-233705"
"base": "5.0.0-0.nightly-arm64-2026-05-07-233705"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3277eaa3a85a72ce660972f7baebbe0748e7c9f011856c0a663dd46456275484",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e9864b5d80dfd8f55aabae4b59c1589d5c5632085def754a3857a34b8a371f73",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:7f283ab977c67b26b55efc5476855e16e24a46b453a01a2d8ff389aca4db4547",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0446463c285378b96336a9bcfdc1560181ceb3c2c2c9d0e1274c4978d043a10e",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f571b5d5727dd2f1ab6093338bf12d9fad21d6672a2fa3f3a5db0997ebc76d25",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cc92fce3d1515a67507dde231828df292e47d8c1e10bf399d12cf395ff9d5178",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b6761de6a76f9dad5eaef988546747c4836b3ead5e619d20026824a9dc2b0893",
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:dd590c51d530eb48f689e8097e2c5bbfe319f55a6a034620c88cad76666c23f1",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8fa002a213169cb15d7e2e1a453de7e27ee351d831e44d024c99fcb9ae03c8ce",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c4ca276618e4a0d96d52743bebb3080891dfe1e303133beacf2bd37b73e0320f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1ed9257b8ee67cac5f75a6cb8ff80ff99e44bf67e2864b1fb7a7a09c34d5bdb6",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:531ff65e820f164733ffbf84b6473409826c9590b97a0a779a1f24031935203e",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3fe0f31aebb1871d61ab5d5996cd7171e57027d419747130743e60a45c512939",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:fa287ac17c526a95fdf8a5a7a4be597ac77b46c0120838f2643f8e0f13f7b79e",
"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:ce0f839b8e9c87191ea14eb415d2e4da4f938f31d67e22b00ecea232528ed4c5"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:499419aed4bec193ecdd2c1a3e9f80dc87caa117c4ecec88d08938cc35ebf696"
}
}
18 changes: 9 additions & 9 deletions assets/release/release-x86_64.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-2026-05-05-231020"
"base": "5.0.0-0.nightly-2026-05-07-114403"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e8b207ab1f79cd199ed14b049e94c0b20575a432f345c6b26958e93f8bd0950f",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:304935bdd611c30672df711b3a2ef97166a103adbf8b001cdf5e4f4522da5271",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0549986bcbce883d1025bf92e21226e3a651405f543b97e39a9cec663aa975ce",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3482ea3d2b8dce334f07b89086fdb06543d1a1680b4e71f937fbd13a171c42cf",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a1665452c9943ca04b084e2f6b5016690ac820212687a3767ff1c89bdeb1a6f6",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:928bc512af4f6a8372f90d9e3c1aae0e5f11def3ad36e94e96be9abf0e98c718",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:5e568f1c00750c8e248388b53d4c3b12a5cdb714e350a74a5199c52ec11c8613",
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:ed5939130af392e761cbb664373f901fc4493fbe6a424b5b63f2f83eac22256f",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a5da0cf18dfcac91ba02842f7f1303815c9848e787f5bc62eb1b0c06c970dfad",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:852316baf30018a983f00f600d4a6306b4b2745b7e8227de3356682dbc5cd2fb",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8222e4f74bbfa6138b29668f3c54d4df920a9ff67cfefca877bb9932cfc65ae9",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f6c8d741caf8400bfc5e90ba721b7331e284c6ee63ec6cd753fe8aff0a641248",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a0e20ffbf1dbde1d887ca948c8b8ef2404b0b4a0d00187402edf22665e5ed578",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c5d024b03285795cd3d3f2f110de6465c315fed3c1fc695343d9c5106862d794",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:2fb9d63f94d6f17f4ddd326d2dd8f78b041b8001747117919eb87e30a6a150f4"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:69d05cdbea20351d2baaea5fc112d6aeaa668bf13b6d69532e5632d5679bbdca"
}
}
3 changes: 3 additions & 0 deletions etcd/vendor/github.com/openshift/microshift/pkg/config/config.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

85 changes: 60 additions & 25 deletions etcd/vendor/github.com/openshift/microshift/pkg/config/dns.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_amd64.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:928bc512af4f6a8372f90d9e3c1aae0e5f11def3ad36e94e96be9abf0e98c718"
pause_image = "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a0e20ffbf1dbde1d887ca948c8b8ef2404b0b4a0d00187402edf22665e5ed578"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
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:cc92fce3d1515a67507dde231828df292e47d8c1e10bf399d12cf395ff9d5178"
pause_image = "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3fe0f31aebb1871d61ab5d5996cd7171e57027d419747130743e60a45c512939"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
Loading