Skip to content

NO-ISSUE: rebase-release-4.21-4.21.0-0.nightly-2026-05-03-094036_amd64-2026-05-03_arm64-2026-05-04 #6619

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 10 commits into from
May 4, 2026
Merged

NO-ISSUE: rebase-release-4.21-4.21.0-0.nightly-2026-05-03-094036_amd64-2026-05-03_arm64-2026-05-04 #6619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e5db035
update last_rebase.sh
May 4, 2026
c9b5a13
update changelog
May 4, 2026
36250ab
update microshift/go.mod
May 4, 2026
bbd2a60
update microshift/deps
May 4, 2026
4bc6b2f
update microshift/vendor
May 4, 2026
081416b
update etcd/go.mod
May 4, 2026
fd1a21d
update etcd/vendor
May 4, 2026
11411da
update component images
May 4, 2026
97132e9
update manifests
May 4, 2026
15fc48c
update buildfiles
May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions Makefile.kube_git.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=34
KUBE_GIT_VERSION=v1.34.6
KUBE_GIT_COMMIT=dfffacdf0ad6e9aa75664c7b3167dd2ddbfc17ba
KUBE_GIT_VERSION=v1.34.7
KUBE_GIT_COMMIT=ae1604b0cb7cc72e353d0b8311c6d62c34143661
KUBE_GIT_TREE_STATE=clean
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.21.0-0.nightly-arm64-2026-04-30-034902
OCP_VERSION := 4.21.0-0.nightly-arm64-2026-05-04-034902
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.21.0-0.nightly-2026-04-21-005726
OCP_VERSION := 4.21.0-0.nightly-2026-05-03-094036
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-v4.0-art-dev
digest: sha256:ec10a1f9afaf933780251f1c01dc3b294013d8c8368000092e248ce09131c272
digest: sha256:f0afe04a1d8fd8c07f850ed7b68e0dcc6dc31bae391edd345aa5577f6c29d9dd
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:7b2467373878b7498447de1b5585dc892c1f5243d11662f924e1cfb98a84dab3
digest: sha256:694f1f733680b95e48a5cff7d027d32e1cfe012ef8b9371900e2850424650a1e
2 changes: 1 addition & 1 deletion assets/components/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.21.0-0.nightly-arm64-2026-04-30-034902"
"base": "4.21.0-0.nightly-arm64-2026-05-04-034902"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b6c9c2bae557f96c8b388229bc18c485c617df7c148c91ef916f0bc358954af",
Expand Down
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": "4.21.0-0.nightly-2026-04-21-005726"
"base": "4.21.0-0.nightly-2026-05-03-094036"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec10a1f9afaf933780251f1c01dc3b294013d8c8368000092e248ce09131c272",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b2467373878b7498447de1b5585dc892c1f5243d11662f924e1cfb98a84dab3"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0afe04a1d8fd8c07f850ed7b68e0dcc6dc31bae391edd345aa5577f6c29d9dd",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:694f1f733680b95e48a5cff7d027d32e1cfe012ef8b9371900e2850424650a1e"
}
}
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-v4.0-art-dev
digest: sha256:c9f0957246a9fd41dabbce7d07067675c8d072c3d920d0b0c327e0d25c6181cf
digest: sha256:319267f98683ac64036ab3783830e41879a64397378612fae0f9bcd283b2c70d
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:96142d72efddddfa13c11bb9fb6707b431f4c1191d662493a7f7a15217b99ee9
digest: sha256:3068cc228d3597e68de801774e5c35e2d359b9ce97413fc8af7de46f992d7ea4
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:a8cffee2e5522fe4bb17e80c8d9746f59aace8d5cabfff978fdae1f550f5c815
digest: sha256:731316e9d5192651ed8706d614a00dc3cb02dc2c42a208ee2c9ba8426509d329

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:96142d72efddddfa13c11bb9fb6707b431f4c1191d662493a7f7a15217b99ee9
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3068cc228d3597e68de801774e5c35e2d359b9ce97413fc8af7de46f992d7ea4
- 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:c9f0957246a9fd41dabbce7d07067675c8d072c3d920d0b0c327e0d25c6181cf
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:319267f98683ac64036ab3783830e41879a64397378612fae0f9bcd283b2c70d
target:
kind: Deployment
labelSelector: app=catalog-operator
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.21.0-0.nightly-arm64-2026-04-30-034902"
"base": "4.21.0-0.nightly-arm64-2026-05-04-034902"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d05f51f18474e52b95c9b8c86c000c547df98b49fe55e10a427a2c67411a63d1",
Expand Down
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": "4.21.0-0.nightly-2026-04-21-005726"
"base": "4.21.0-0.nightly-2026-05-03-094036"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c9f0957246a9fd41dabbce7d07067675c8d072c3d920d0b0c327e0d25c6181cf",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96142d72efddddfa13c11bb9fb6707b431f4c1191d662493a7f7a15217b99ee9",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8cffee2e5522fe4bb17e80c8d9746f59aace8d5cabfff978fdae1f550f5c815"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:319267f98683ac64036ab3783830e41879a64397378612fae0f9bcd283b2c70d",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3068cc228d3597e68de801774e5c35e2d359b9ce97413fc8af7de46f992d7ea4",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:731316e9d5192651ed8706d614a00dc3cb02dc2c42a208ee2c9ba8426509d329"
}
}
4 changes: 2 additions & 2 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.21.0-0.nightly-arm64-2026-04-30-034902"
"base": "4.21.0-0.nightly-arm64-2026-05-04-034902"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:826dfc57c377acc63c2346713c8e692615528772e4e527eb8cfe6301b8bd4417",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39a0574bd2ed6b102ef7f042571e4f6b0a9814721bc2cf9c527be0d29022421c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b56494e4f4e46900d02ec8c10e3809c1a525622f636615f0ff506004d5e6689f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1a372a8f9286d74a98a69e0e15820becfd71bdd4f1d3930011fb508b41588cda",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:683b44cb7a83f8b13dd18c07234c89def6e19fffa055cdf58c0d584bc91b7245",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca349904729094836396a69b4f46321dc5ac07d1f8b630600b32b5c0ef49a35a",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f2a4eef3b27e80cff8e4e9e7cb16d50d29bbb21d6dd0f1b99bdd9473d0ca162",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e9cef58e139dda994caab9a64979c39940ced8730c50939be5959997bf303749",
"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:c88c72905f72e6d80d78040b6e2c2d51f197421a9c8c8fa9b6b0dd5ae38dc953"
Expand Down
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": "4.21.0-0.nightly-2026-04-21-005726"
"base": "4.21.0-0.nightly-2026-05-03-094036"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c7ff42d7f9875f7697d6c082f1cddf09aebd02b48c99b781a98ba89cdee311a",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:549b356183abd2f8c43f865b53b337eadd57a10b2852221c4554b314afd9ee37",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b55d75bc9cf4dd9eb7e982e316da7bf07c8752fd15bcb08f5d2e476973f3aed3",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8cffee2e5522fe4bb17e80c8d9746f59aace8d5cabfff978fdae1f550f5c815",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:26c94add8eb16cbbd52f5c5ef94eabbc99810780b2144ba81354e78528aa1dd7",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e9f3cd1f3ec584d3f20f10703bc3a9d3c75843f2d345ca07d1cb395efaae2020",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7242db527eab2aeda7184283365af2bbe3609575b19dcf57f84ad165216bdb5",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50b833978643e8bf0e011b3dd34dbb2fd6699fae6717cd6a67f93e1273c3e33f",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ced13f92744806c8576a3dc9c0b60fa0e3f62a2e52afd626343edffdfbe2526",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c31d04007556770a48a0c2b14c31ef175de41621f999da3022fdbdeb7f7823f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:731316e9d5192651ed8706d614a00dc3cb02dc2c42a208ee2c9ba8426509d329",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bbf7454f42c46638ced7de38fee82c4c52ddfaa1d930bf415b6e99a9de84986f",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f5cd86ba83e07ee2aa3e8ae0629a9307dd20438e21e773ad1e53c94d38e4f29",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47cbda63c8be13657b375fc924d53209b424eba96b6f4c9dd84e99df84e2d9a6",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:948706f8ca4420b6ae52ee28ffdcc190b03d6282898e995fdc03e4b4f74ba393"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae5ac6686419a78807389311d249773f0ad5440de118b247e79f6dc4a2b83cf8"
}
}
2 changes: 1 addition & 1 deletion deps/github.com/openshift/kubernetes/.go-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.24.13
1.25.9
Loading