Skip to content

NO-ISSUE: rebase-release-4.21-4.21.0-0.nightly-2026-03-29-021947_amd64-2026-03-29_arm64-2026-03-30 #6425

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 4 commits into from
Mar 30, 2026
Merged

NO-ISSUE: rebase-release-4.21-4.21.0-0.nightly-2026-03-29-021947_amd64-2026-03-29_arm64-2026-03-30 #6425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe7a64e
update last_rebase.sh
Mar 30, 2026
11c9aef
update changelog
Mar 30, 2026
9461e6b
update manifests
Mar 30, 2026
6dfd607
update buildfiles
Mar 30, 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.21.0-0.nightly-arm64-2026-03-26-001731
OCP_VERSION := 4.21.0-0.nightly-arm64-2026-03-30-015504
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-03-25-154217
OCP_VERSION := 4.21.0-0.nightly-2026-03-29-021947
2 changes: 1 addition & 1 deletion 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:48e326724332581ad424bddef482ca80261e983e5d690b7e2065ef68f322e735
digest: sha256:e34806d7d7505db0f3eaebd142e4a90d9c592fc7951e425205a914a4aa45155b
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:a5184aca1462287c0d296becd5a34b89ebe999eb4833c38083fde59093d708b9
2 changes: 1 addition & 1 deletion assets/components/multus/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ images:
digest: sha256:589c14232f169ebf2c7146f3e979802cc33d8a2ed743a6ddf1a58b5cafa0d894
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:949e90a98682ae9d1a9f4802d5feb2d95025ca57a7a87d3bc3ba86cc9c0005bb
digest: sha256:8ad560d2244ef733306c69a4393321132a8af05001233043df16befc78b35527
4 changes: 2 additions & 2 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.21.0-0.nightly-arm64-2026-03-26-001731"
"base": "4.21.0-0.nightly-arm64-2026-03-30-015504"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48e326724332581ad424bddef482ca80261e983e5d690b7e2065ef68f322e735",
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e34806d7d7505db0f3eaebd142e4a90d9c592fc7951e425205a914a4aa45155b",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5184aca1462287c0d296becd5a34b89ebe999eb4833c38083fde59093d708b9"
}
}
4 changes: 2 additions & 2 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-03-25-154217"
"base": "4.21.0-0.nightly-2026-03-29-021947"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:589c14232f169ebf2c7146f3e979802cc33d8a2ed743a6ddf1a58b5cafa0d894",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:949e90a98682ae9d1a9f4802d5feb2d95025ca57a7a87d3bc3ba86cc9c0005bb"
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ad560d2244ef733306c69a4393321132a8af05001233043df16befc78b35527"
}
}
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:09800841f4377c222e5ffd5eebcdf09477d91de31d533b040028cdeb5dda7916
digest: sha256:a74f98353ccc73e65f86201e5e68eaba79acebfe09cf73459e683c9b74f9bd9e
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:d23d4d0d0c60f9393697302e2f66838b2180935ba0a1977a905d911be115fc5f
digest: sha256:7395b7ee51cfca48916da6a73dad238cc4fe2875d24da80a760cc235c652029e
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:81117862eeac75f7f5fcd99b6c0d13ce54b30e6bb96c0488dca08e377f14e85a
digest: sha256:812485c23d8dcae2f80fa330f64d908e191746877e55bf307ad3b9379f353bda

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:d23d4d0d0c60f9393697302e2f66838b2180935ba0a1977a905d911be115fc5f
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7395b7ee51cfca48916da6a73dad238cc4fe2875d24da80a760cc235c652029e
- 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:09800841f4377c222e5ffd5eebcdf09477d91de31d533b040028cdeb5dda7916
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a74f98353ccc73e65f86201e5e68eaba79acebfe09cf73459e683c9b74f9bd9e
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 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,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:ec4ecabda7cb0a7dde3d85307fae859ec945445655bdcdef6d303d6fe393795e
digest: sha256:0d718017af6b66188203fd57a9315113192617a88966bf7168373dd81cb2ca07
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:a4edd5f92fb42e917a6d588967880aee9e14ed2682c5567c4b082184e9e04623
digest: sha256:1230a34167f5af65a5200d930dc3b5e0dd5ceab7574ff88fd913ec37bb88baf2
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:9f0c8638757e0a9dd8ab7ef40fa069576482338933327f18062ac7c5f3b6172e
Expand All @@ -16,12 +16,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4edd5f92fb42e917a6d588967880aee9e14ed2682c5567c4b082184e9e04623
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1230a34167f5af65a5200d930dc3b5e0dd5ceab7574ff88fd913ec37bb88baf2
- 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:ec4ecabda7cb0a7dde3d85307fae859ec945445655bdcdef6d303d6fe393795e
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d718017af6b66188203fd57a9315113192617a88966bf7168373dd81cb2ca07
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.21.0-0.nightly-arm64-2026-03-26-001731"
"base": "4.21.0-0.nightly-arm64-2026-03-30-015504"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09800841f4377c222e5ffd5eebcdf09477d91de31d533b040028cdeb5dda7916",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d23d4d0d0c60f9393697302e2f66838b2180935ba0a1977a905d911be115fc5f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81117862eeac75f7f5fcd99b6c0d13ce54b30e6bb96c0488dca08e377f14e85a"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a74f98353ccc73e65f86201e5e68eaba79acebfe09cf73459e683c9b74f9bd9e",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7395b7ee51cfca48916da6a73dad238cc4fe2875d24da80a760cc235c652029e",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:812485c23d8dcae2f80fa330f64d908e191746877e55bf307ad3b9379f353bda"
}
}
6 changes: 3 additions & 3 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-03-25-154217"
"base": "4.21.0-0.nightly-2026-03-29-021947"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec4ecabda7cb0a7dde3d85307fae859ec945445655bdcdef6d303d6fe393795e",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4edd5f92fb42e917a6d588967880aee9e14ed2682c5567c4b082184e9e04623",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d718017af6b66188203fd57a9315113192617a88966bf7168373dd81cb2ca07",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1230a34167f5af65a5200d930dc3b5e0dd5ceab7574ff88fd913ec37bb88baf2",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f0c8638757e0a9dd8ab7ef40fa069576482338933327f18062ac7c5f3b6172e"
}
}
12 changes: 6 additions & 6 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.21.0-0.nightly-arm64-2026-03-26-001731"
"base": "4.21.0-0.nightly-arm64-2026-03-30-015504"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b49beb50cde6d84d796d9be8426a042aac550bafc9b5db478f1d2830eeeaf171",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03f81b2936c2867267aadc91e8b7e8b47c4589543d57ee7fab05aaae0ce5bf0b",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:26ad3e5f08edbf77dcf47c978f25dc549a346e357090c93eceaf3640af678f6b",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe08c90fc54709cc21ff51b33df6004b145167e7e22573faf905d37af1f28665",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81117862eeac75f7f5fcd99b6c0d13ce54b30e6bb96c0488dca08e377f14e85a",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9ff69c0672c448470278b50c12570336850a4349668f474ab5536ba6f1b26d2",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:812485c23d8dcae2f80fa330f64d908e191746877e55bf307ad3b9379f353bda",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55c85d59a358d514ff5995a65a6bc5f4b33e0b6de564b15f9c8c99948e28af51",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2b1627da8ee5e46585d9dacac10d6b1475c0f101a8f1afc48d6ec489c033952",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c275d61239043af2fe72afa1b4b9f28af41241ac3a1cf402679f6125b66d744d",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:53cb882323ba52d69b6e19a5dbda748508a93973d0e929e0a3b1298a04e88a52",
"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:ffe170ab4e31cf6994d3ae9436f3c8837314345d5c2010b5e87e9e303ca622a2"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6245c87a0fd57c6d5b6834a6a23785d2d04ab73d85b2e0432feba60aef0b6bc"
}
}
10 changes: 5 additions & 5 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-03-25-154217"
"base": "4.21.0-0.nightly-2026-03-29-021947"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c53bb9d15b7c2163deee098e16a3c3c13b9b11feedd42ce175303ac8c57d796",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:189e1ab3a3e8756342f2b846dfc890f0c2d1d4e20746afaec87b655ad777701e",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c569abe94b0c47956d6b0931fc1992c9649fb24292c7885816228c6ca130da1c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d7767202aecccd0af8251c5d40e16a93d2d6867ef7ab7f31314266cc5404dbba",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f0c8638757e0a9dd8ab7ef40fa069576482338933327f18062ac7c5f3b6172e",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e53e902adda8dc92e956c57f1570b259c8c82d9ad88bd8a383d4de9a2ba9405b",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5524f5ec83595dc95ed4bb46dbff3886a222d2887125d513534553162e366334",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d71804dbb7f1df3f7deab7cbade03a5acef58e18de6328743ed4b81023c958a8",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:369053797b7a1812fe0bd9d44900cd479701ceb99efb3cbdbf091e710b709513",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a18eb41d437dc60f21d2c8e09a1e21378a282a3be3c8d0d9a5a96360f26ce56",
"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:95105056477d87c82e5690647de618af1df00f58a9d0f0c87edab7a185d9857c"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f3a25ee09639b23d79494bebfcebcb57e004f018cac8bc4a6e5fac65a047627"
}
}
Loading