Skip to content

NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2026-03-18-205520_amd64-2026-03-18_arm64-2026-03-23 #6389

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: release-4.20
Choose a base branch
from
+31 −53
Open

NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2026-03-18-205520_amd64-2026-03-18_arm64-2026-03-23 #6389

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
ab5de75
Update Go version
Mar 23, 2026
167fffc
update last_rebase.sh
Mar 23, 2026
d2d2d04
update changelog
Mar 23, 2026
97f84b4
update component images
Mar 23, 2026
85b4d41
update manifests
Mar 23, 2026
f68f34e
update buildfiles
Mar 23, 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.20.0-0.nightly-arm64-2026-03-15-225156
OCP_VERSION := 4.20.0-0.nightly-arm64-2026-03-23-012259
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.20.0-0.nightly-2026-03-14-030631
OCP_VERSION := 4.20.0-0.nightly-2026-03-18-205520
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-v4.0-art-dev
digest: sha256:a42d5ec3c0b582a70bfb2297f3f7461f4b516aa28ea8a6c12c6bca2af51a9e7e
digest: sha256:d66d1c08ac991ec35693b69578a692470193c752de23928828d050a8fd5c92a2
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:ee8ef9b71b81d64e1c95c28aa12093098c55dbb4a970f16237aee5cfa1f1756d
digest: sha256:3d4536a000ea18163acd72e8b798b2dd27bf8cf8c046455981ffe70daa5448d3
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": "4.20.0-0.nightly-arm64-2026-03-15-225156"
"base": "4.20.0-0.nightly-arm64-2026-03-23-012259"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a42d5ec3c0b582a70bfb2297f3f7461f4b516aa28ea8a6c12c6bca2af51a9e7e",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ee8ef9b71b81d64e1c95c28aa12093098c55dbb4a970f16237aee5cfa1f1756d"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d66d1c08ac991ec35693b69578a692470193c752de23928828d050a8fd5c92a2",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d4536a000ea18163acd72e8b798b2dd27bf8cf8c046455981ffe70daa5448d3"
}
}
2 changes: 1 addition & 1 deletion assets/components/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.20.0-0.nightly-2026-03-14-030631"
"base": "4.20.0-0.nightly-2026-03-18-205520"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0958362f0fd9f365fe7c0553d468ca4b116c5b879c26b8035205fd95fbda79c4",
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:d73fb109074fa5b6b424e006a9e2c2fd7fb18417e3595beed0c4ecb40eeb5a74
digest: sha256:425310f4d8ef3692082faa1169cd264f0ac70a82578a68837b3baf09c29a10bb
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:30c8b7393e61e2a297a042a9471640788eed9bc54d12ab2c30a669b2bc424136
digest: sha256:94dd9c99867909609f5f50285fc9a185cb35dbdfefacdd8052c04b648cb4c974
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:4bd4ba390e83fb3eff7d17281090981125e08ecb458969b5ac95da4342641e65
digest: sha256:35565cb70434e0e0d9e13836eb3599598c7fde88778664c8a3a7b09773caa91f

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:30c8b7393e61e2a297a042a9471640788eed9bc54d12ab2c30a669b2bc424136
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:94dd9c99867909609f5f50285fc9a185cb35dbdfefacdd8052c04b648cb4c974
- 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:d73fb109074fa5b6b424e006a9e2c2fd7fb18417e3595beed0c4ecb40eeb5a74
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:425310f4d8ef3692082faa1169cd264f0ac70a82578a68837b3baf09c29a10bb
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.20.0-0.nightly-arm64-2026-03-15-225156"
"base": "4.20.0-0.nightly-arm64-2026-03-23-012259"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d73fb109074fa5b6b424e006a9e2c2fd7fb18417e3595beed0c4ecb40eeb5a74",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:30c8b7393e61e2a297a042a9471640788eed9bc54d12ab2c30a669b2bc424136",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4bd4ba390e83fb3eff7d17281090981125e08ecb458969b5ac95da4342641e65"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:425310f4d8ef3692082faa1169cd264f0ac70a82578a68837b3baf09c29a10bb",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:94dd9c99867909609f5f50285fc9a185cb35dbdfefacdd8052c04b648cb4c974",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35565cb70434e0e0d9e13836eb3599598c7fde88778664c8a3a7b09773caa91f"
}
}
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.20.0-0.nightly-2026-03-14-030631"
"base": "4.20.0-0.nightly-2026-03-18-205520"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:45153e4c66f37343ea27bab6df05b9c45a9b75d346678c574a2645ac26a6af3e",
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.20.0-0.nightly-arm64-2026-03-15-225156"
"base": "4.20.0-0.nightly-arm64-2026-03-23-012259"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d36f927b9c24b3647fe58e5b3579a6bcb2b0b50322db690d885572e0d8492ef9",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e56be34b942905008d2b7f1ebefe0a4446cb35da9f4bf09e1e3c0e15d88395f",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15a421e4461be8683d967387b1224fcc0179d478f46618d03c0e7f1222ca4c69",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4bd4ba390e83fb3eff7d17281090981125e08ecb458969b5ac95da4342641e65",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:21a09683622f27d380a8b962b345f5b162dbbc3c602eedb823a3cfe533449db0",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca3319b72e74c7d6a773ad551c6cda70c06448dc07afd4bda20c698e4438f253",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4023611263777c3f71fd89b5072b36667dbfb91bd2fceee2923ca590d013defb",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d907caa18096fe6d32098b7f718ba700c4dc736b4aa738b46739e357b6d271f",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:153c361e573c93bd376c5a3ece7989c55a1a675a65023473fdc17e2393fcc1c1",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:712fd1790f4b1e0c973759dedb58be40e232ef86a34dfaa0d420d0184444feeb",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35565cb70434e0e0d9e13836eb3599598c7fde88778664c8a3a7b09773caa91f",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83ac2af472c5f479194e9f1cc40530e9ee901f83460bf23329b8d53a4b9d1461",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49ab6e90687ffa1bb0b4135fbc5a17dc551a3563219daa782223d6e2871e0d3e",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31ab91783d13a45d2091cd33c4020a942caa1a20266b338d87cdfd80633cfd52",
"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:ae9f9c747fc7f26dc4fe31644db03b93c7de10384eae1dd40b40767c2e654667"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7bb34197de79bc4805f80e2beb108a143048b17df91f7ca548123a68dbb42651"
}
}
2 changes: 1 addition & 1 deletion assets/release/release-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.20.0-0.nightly-2026-03-14-030631"
"base": "4.20.0-0.nightly-2026-03-18-205520"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d07f82ed2b467215c084754ef1fdb349536bbe0e3c83e3d48a2ab7a97b7f355",
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 @@ -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-v4.0-art-dev@sha256:ca3319b72e74c7d6a773ad551c6cda70c06448dc07afd4bda20c698e4438f253"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49ab6e90687ffa1bb0b4135fbc5a17dc551a3563219daa782223d6e2871e0d3e"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
22 changes: 0 additions & 22 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +0,0 @@
- kubernetes embedded-component b96a4039358613f770d20f5e4ce5125f66369521 to 4ef1baeb6786a70898f3842a06e988d9566aa444
- 481433b5f 2026-03-06T14:46:01-05:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
- 69220b617 2026-02-26T20:19:41+00:00 Release commit for Kubernetes v1.33.9
- e4aef7c31 2026-02-12T14:07:59+01:00 Bump images and versions to go 1.24.13 and distroless iptables
- e95f580e5 2026-02-10T13:05:56+00:00 Update CHANGELOG/CHANGELOG-1.33.md for v1.33.8

- operator-framework-olm embedded-component 9cdde3bd7bf69417ec1a26a4c757f565b0107d0e to 12a261a3702726aaaa339c5d2fceb8b6078ceec8
- 5317aa59 2026-03-09T11:57:15-04:00 remove EndpointSlice content as it doesn't seem to be supported on 4.20 branch
- 479c4a33 2026-03-08T20:52:45-04:00 OCPBUGS-77958: Update NetworkPolicy egress to support HyperShift custom API ports

- kubernetes image-amd64 b96a4039358613f770d20f5e4ce5125f66369521 to 4ef1baeb6786a70898f3842a06e988d9566aa444
- 481433b5f 2026-03-06T14:46:01-05:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
- 69220b617 2026-02-26T20:19:41+00:00 Release commit for Kubernetes v1.33.9
- e4aef7c31 2026-02-12T14:07:59+01:00 Bump images and versions to go 1.24.13 and distroless iptables
- e95f580e5 2026-02-10T13:05:56+00:00 Update CHANGELOG/CHANGELOG-1.33.md for v1.33.8

- kubernetes image-arm64 b96a4039358613f770d20f5e4ce5125f66369521 to 4ef1baeb6786a70898f3842a06e988d9566aa444
- 481433b5f 2026-03-06T14:46:01-05:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
- 69220b617 2026-02-26T20:19:41+00:00 Release commit for Kubernetes v1.33.9
- e4aef7c31 2026-02-12T14:07:59+01:00 Bump images and versions to go 1.24.13 and distroless iptables
- e95f580e5 2026-02-10T13:05:56+00:00 Update CHANGELOG/CHANGELOG-1.33.md for v1.33.8

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.20.0-0.nightly-2026-03-14-030631" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2026-03-15-225156"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.20.0-0.nightly-2026-03-18-205520" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2026-03-23-012259"
2 changes: 1 addition & 1 deletion scripts/devenv-builder/configure-vm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ if ${INSTALL_BUILD_DEPS} || ${BUILD_AND_RUN}; then
[[ -d /run/systemd/system ]] && sudo systemctl enable --now cockpit.socket
fi

GO_VER=1.24.3
GO_VER=1.24.13
GO_ARCH=$([ "$(uname -m)" == "x86_64" ] && echo "amd64" || echo "arm64")
GO_INSTALL_DIR="/usr/local/go${GO_VER}"
if ${INSTALL_BUILD_DEPS} && [ ! -d "${GO_INSTALL_DIR}" ]; then
Expand Down