From 4185da9339bbcb010710ef24e51a0c615906ec9b Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 10 Jun 2026 04:13:25 +0000 Subject: [PATCH 1/8] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 5b6c4e608c..0f507bbbc8 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release-5:5.0.0-0.nightly-2026-06-08-075337" "registry.ci.openshift.org/ocp-arm64/release-5-arm64:5.0.0-0.nightly-arm64-2026-06-09-012537" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release-5:5.0.0-0.nightly-2026-06-09-112600" "registry.ci.openshift.org/ocp-arm64/release-5-arm64:5.0.0-0.nightly-arm64-2026-06-10-025037" From 46f2a8b0cbf81e6cf899cd9c47b6cfd878615436 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 10 Jun 2026 04:13:25 +0000 Subject: [PATCH 2/8] update changelog --- scripts/auto-rebase/changelog.txt | 38 ++++++++++++++++++++++++++++++- scripts/auto-rebase/commits.txt | 18 +++++++-------- 2 files changed, 46 insertions(+), 10 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index db7963adc7..f8de7a5969 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +1,39 @@ -- oc image-arm64 d1f312bb855e741cadb8b3ac419d2cb3f3fd7ba5 to 4007283544cbc3609f90375b7a8efd395561612f +- cluster-kube-apiserver-operator embedded-component 24b60d04b3478e04a728fb0ae1385abc6a478d20 to a61282875d032c4b8cc7ea5567830942583ec378 + - 75e998a 2026-06-08T13:41:30+02:00 NO-JIRA: Automatic agentic rebase: Update library-go to 0469313 + - e126bb0 2026-06-01T12:29:56+02:00 Fix kube-apiserver-to-kubelet-signer refresh interval + +- cluster-kube-controller-manager-operator embedded-component 9d636ab4992bd501006d2b0c1d3ac512666c6ca7 to c35307f04313369c9ba4dcab3308506a3987065e + - aa0c868 2026-06-03T17:05:46+05:30 fix lock failure cases + +- etcd embedded-component c543fe15324510d13e896c31232ecd5d100d9de5 to bf6c0094589afdf6c814a28c24f8f1bb5a577816 + - d4656811 2026-06-06T16:04:21Z Updating ose-etcd-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/7691ed4dc0b6585b358f9e73fb736ace9a48a286/images/ose-etcd.yml + +- machine-config-operator embedded-component 62b06d28399b348cb7238d32ad74b9a978c4292f to 62dbab4477ce608b73bb8d4b190b0f522d2a5bb5 + - cfb74c3e 2026-06-05T13:08:35-04:00 Fix error wrapping and error message casing + - a96a9248 2026-06-05T08:57:59Z MCO-2321: adapt osimagestream tests to clusters with rhel-10 default stream + - b547d0ae 2026-06-04T07:50:22-04:00 avoid running IRI deletion tests for standard e2e IRI tests + - 55be329d 2026-06-03T14:48:40+05:30 Reorder functions to match source file sequence + - 02d7d918 2026-06-02T20:20:43+05:30 Add bootstrap infrastructure and migrate test 53960 + - 80b16676 2026-06-02T20:20:43+05:30 Migrate registry tests from openshift-tests-private + - dbea5e53 2026-05-28T15:23:08-04:00 bootimage: use version for vsphere hotloop check + +- operator-framework-olm embedded-component a1de734673fb56da500b6ea212a70d50bd5740ab to c0b1b223882bd7657853441ccf18099527a8841b + - 230f72bf 2026-06-05T10:25:33-04:00 [CARRY] fix unit test failure + - 2d13397d 2026-06-05T06:43:47-04:00 UPSTREAM: : Update to golang 1.26.3 and openshift-4.23 builders + +- oc image-amd64 d1f312bb855e741cadb8b3ac419d2cb3f3fd7ba5 to 4007283544cbc3609f90375b7a8efd395561612f - c57c61a1 2026-06-08T04:25:30Z Updating openshift-enterprise-deployer-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/af322abdd1a4d7d0161a69a16369a0ab1748515a/images/openshift-enterprise-deployer.yml +- csi-external-snapshotter image-arm64 77d02e52a442c1a98457797bf8eb5777489aabae to 6411c3232ca015c2a02ece1d5a675045d17031cd + - 872813a 2026-06-07T12:35:43Z UPSTREAM: : Updating ose-csi-snapshot-controller-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/af322abdd1a4d7d0161a69a16369a0ab1748515a/images/ose-csi-snapshot-controller.yml + +- router image-arm64 a86164c8ebaed55a2a28451fa913a04f10cc9a72 to 808b0001233b4c084694244f25cd53c3808c4e81 + - d180c82 2026-06-08T18:21:01-03:00 OCPBUGS-87205: fix comments on template + - 861e7c2 2026-06-08T11:47:45-03:00 Update images/router/haproxy/conf/haproxy-config.template + - fca5221 2026-06-08T11:47:45-03:00 Expand list of stripped X-SSL-Client-* headers + - ef98dff 2026-06-08T11:47:45-03:00 Rename env var to ROUTER_MUTUAL_TLS_HEADER_FILTER + - 2e0ec41 2026-06-08T11:47:45-03:00 OCPBUGS-86718: Strip X-SSL-Client-* headers for plain HTTP + +- kubernetes image-arm64 872bd3722d0954b31459f715fbd4fb7612aaf338 to d8d517e6bbe7cf7359026cac26bb96ea45e18806 + - 59c831f7c 2026-06-06T16:54:59-04:00 UPSTREAM: : add kubernetes/conformance umbrella suite + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 34eaf2608d..da804158be 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -2,22 +2,22 @@ https://github.com/openshift/api embedded-component 1194f4c62539275cd6dec231cc2b https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 108f37f0e378accc322cbeb68136ec500ec35b94 https://github.com/openshift/cluster-dns-operator embedded-component 65d60f9c12297a91ee89359e90f591fd44e661b0 https://github.com/openshift/cluster-ingress-operator embedded-component 140e0bf13b3d01c369672c766c44b4be0b4ec78c -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 24b60d04b3478e04a728fb0ae1385abc6a478d20 -https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 9d636ab4992bd501006d2b0c1d3ac512666c6ca7 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component a61282875d032c4b8cc7ea5567830942583ec378 +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component c35307f04313369c9ba4dcab3308506a3987065e https://github.com/openshift/cluster-kube-scheduler-operator embedded-component d43423b583269eea8236040424609c3f108ac9c4 https://github.com/openshift/cluster-network-operator embedded-component 6dc18040e7c214f6a1db25b6f5ef4642c6c6a186 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 34f95b07f4afbc47558e54e4fa2710fd692e615e https://github.com/openshift/cluster-policy-controller embedded-component bb429f5b2a7d77791110b06d8ec5c017183e3ab9 https://github.com/openshift/csi-external-snapshotter embedded-component 77d02e52a442c1a98457797bf8eb5777489aabae -https://github.com/openshift/etcd embedded-component c543fe15324510d13e896c31232ecd5d100d9de5 +https://github.com/openshift/etcd embedded-component bf6c0094589afdf6c814a28c24f8f1bb5a577816 https://github.com/openshift/kubernetes embedded-component 872bd3722d0954b31459f715fbd4fb7612aaf338 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 72835e43c7754356645e41031f3a99926b4d42e6 -https://github.com/openshift/machine-config-operator embedded-component 62b06d28399b348cb7238d32ad74b9a978c4292f +https://github.com/openshift/machine-config-operator embedded-component 62dbab4477ce608b73bb8d4b190b0f522d2a5bb5 https://github.com/openshift/openshift-controller-manager embedded-component 5631cf493b006cbc72a8600a7435813272d71940 -https://github.com/openshift/operator-framework-olm embedded-component a1de734673fb56da500b6ea212a70d50bd5740ab +https://github.com/openshift/operator-framework-olm embedded-component c0b1b223882bd7657853441ccf18099527a8841b https://github.com/openshift/route-controller-manager embedded-component 1916ceb059f500f06e8552f88bf38cd09f9522fd https://github.com/openshift/service-ca-operator embedded-component e7ccfa308e69ce4ad1f2afcd1d7c8ff25144374b -https://github.com/openshift/oc image-amd64 d1f312bb855e741cadb8b3ac419d2cb3f3fd7ba5 +https://github.com/openshift/oc image-amd64 4007283544cbc3609f90375b7a8efd395561612f https://github.com/openshift/coredns image-amd64 3c21b066c9bd86caa06f790dcd1c046667875d46 https://github.com/openshift/csi-external-snapshotter image-amd64 77d02e52a442c1a98457797bf8eb5777489aabae https://github.com/openshift/router image-amd64 a86164c8ebaed55a2a28451fa913a04f10cc9a72 @@ -27,9 +27,9 @@ https://github.com/openshift/kubernetes image-amd64 872bd3722d0954b31459f715fbd4 https://github.com/openshift/service-ca-operator image-amd64 e7ccfa308e69ce4ad1f2afcd1d7c8ff25144374b https://github.com/openshift/oc image-arm64 4007283544cbc3609f90375b7a8efd395561612f https://github.com/openshift/coredns image-arm64 3c21b066c9bd86caa06f790dcd1c046667875d46 -https://github.com/openshift/csi-external-snapshotter image-arm64 77d02e52a442c1a98457797bf8eb5777489aabae -https://github.com/openshift/router image-arm64 a86164c8ebaed55a2a28451fa913a04f10cc9a72 +https://github.com/openshift/csi-external-snapshotter image-arm64 6411c3232ca015c2a02ece1d5a675045d17031cd +https://github.com/openshift/router image-arm64 808b0001233b4c084694244f25cd53c3808c4e81 https://github.com/openshift/kube-rbac-proxy image-arm64 d12e274605248f6c59373240a7eae7a7a357dcb3 https://github.com/openshift/ovn-kubernetes image-arm64 e9295c0d0d7caa1eda7cc9f2f3900c64096c943c -https://github.com/openshift/kubernetes image-arm64 872bd3722d0954b31459f715fbd4fb7612aaf338 +https://github.com/openshift/kubernetes image-arm64 d8d517e6bbe7cf7359026cac26bb96ea45e18806 https://github.com/openshift/service-ca-operator image-arm64 e7ccfa308e69ce4ad1f2afcd1d7c8ff25144374b From a4295426b707d05c6fc0bf1416d84eca5322d07c Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 10 Jun 2026 04:15:12 +0000 Subject: [PATCH 3/8] update etcd/go.mod --- etcd/go.mod | 10 +++++----- etcd/go.sum | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index 96cf16659a..c2fed06e57 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -148,11 +148,11 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251120221002-696928a6a0d7 // from kubernetes - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260508194201-c543fe153245 // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 // from etcd - go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 // from etcd - go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260608152018-bf6c0094589a // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a // from etcd + go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a // from etcd + go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a // from etcd ) replace ( diff --git a/etcd/go.sum b/etcd/go.sum index 8fc5aa0e86..9cb70e33e2 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -156,16 +156,16 @@ github.com/openshift/api v0.0.0-20260511191110-9b69e5fa27e9 h1:yb8ul1HPFYhO04yp0 github.com/openshift/api v0.0.0-20260511191110-9b69e5fa27e9/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo= github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af h1:UiYYMi/CCV+kwWrXuXfuUSOY2yNXOpWpNVgHc6aLQlE= github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE= -github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 h1:8YsERr2Pg/hIfxcdwdXzZg8yZGNc+CtxpRmaYFVHKhA= -github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245/go.mod h1:HYfTh0jyh+uFgp6gMbxJteIDYY97yMuYz85Rnw6Gy9o= -github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260508194201-c543fe153245 h1:Rpg4gRsQ3KgxS6P7kIyjwwrvxGfoVzEkYpf0MTzxWB8= -github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260508194201-c543fe153245/go.mod h1:DysuMe/inqRyC/1tjRR6hReH/VV9Lufs27YKSKBWWJg= -github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 h1:++zoFBX5EUFEj75nsJNh6I/FkvRWKjm95cSwFV0FhYY= -github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245/go.mod h1:vOTDMCo+fGPEClJqcFEFSqZ+8e7WKV7AyqJjX//HR2w= -github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 h1:KLbp27TVKtrrCxWpoyMb86M7Pw9xiD91YciRej1XXCM= -github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245/go.mod h1:L/M2AmhhJ1+3WFRMiJv4Ra0z2hJGYVcsU6q+58NDFfc= -github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 h1:s+OzXjBwHuoUIucTcyhwLpwFj/WhYfT3mIbZOw/CFMs= -github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245/go.mod h1:WGWPgjHk4fWKoC1ftSMuPvUbdOBqeqvc/pDBPQgN1aw= +github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a h1:PdwvzQOXy3n6kOyy8Y6fN+BWjTdeaXHpV8et36hDuCw= +github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a/go.mod h1:HYfTh0jyh+uFgp6gMbxJteIDYY97yMuYz85Rnw6Gy9o= +github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260608152018-bf6c0094589a h1:vwsXYQf1QuliCQMOaWxD05BooXpQtu6Y6qKgS0t6Eh4= +github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260608152018-bf6c0094589a/go.mod h1:DysuMe/inqRyC/1tjRR6hReH/VV9Lufs27YKSKBWWJg= +github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a h1:orM1bvAMCPb8fZhnvYj9/dReLDF8F16jrsNuqsU8ni8= +github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a/go.mod h1:vOTDMCo+fGPEClJqcFEFSqZ+8e7WKV7AyqJjX//HR2w= +github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a h1:7zZDJeCxDZgS6MVK0odd6soDOspiXq16qhCasfcWwps= +github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a/go.mod h1:L/M2AmhhJ1+3WFRMiJv4Ra0z2hJGYVcsU6q+58NDFfc= +github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a h1:GqkRh6b4b21jVs+iqRC3n/zuCnp+mErGY3JGwTzEL4c= +github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a/go.mod h1:WGWPgjHk4fWKoC1ftSMuPvUbdOBqeqvc/pDBPQgN1aw= github.com/openshift/library-go v0.0.0-20260520180710-3a6f949c22c3 h1:AHjJETxL4n2ocMHBY7Epqex574puUSJjKIUkbasYAKI= github.com/openshift/library-go v0.0.0-20260520180710-3a6f949c22c3/go.mod h1:gKG9lctU0yEftSoT3DUyeIWz1oAgF0EHUpwI4pnCo4o= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251120221002-696928a6a0d7 h1:02E4Ttpu+7yCQLQxtY42JfcfHU7TBGnje6uB2ytBSdU= From 907394ffcad8ef7b65846641e6fa1af7a56bbfd8 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 10 Jun 2026 04:15:19 +0000 Subject: [PATCH 4/8] update etcd/vendor --- etcd/vendor/modules.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 6c9c1c6d24..ed65b9372e 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -296,7 +296,7 @@ go.etcd.io/bbolt go.etcd.io/bbolt/errors go.etcd.io/bbolt/internal/common go.etcd.io/bbolt/internal/freelist -# go.etcd.io/etcd/api/v3 v3.6.11 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 +# go.etcd.io/etcd/api/v3 v3.6.11 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a ## explicit; go 1.25.0 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -306,7 +306,7 @@ go.etcd.io/etcd/api/v3/mvccpb go.etcd.io/etcd/api/v3/v3rpc/rpctypes go.etcd.io/etcd/api/v3/version go.etcd.io/etcd/api/v3/versionpb -# go.etcd.io/etcd/client/pkg/v3 v3.6.11 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260508194201-c543fe153245 +# go.etcd.io/etcd/client/pkg/v3 v3.6.11 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260608152018-bf6c0094589a ## explicit; go 1.25.0 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -317,14 +317,14 @@ go.etcd.io/etcd/client/pkg/v3/tlsutil go.etcd.io/etcd/client/pkg/v3/transport go.etcd.io/etcd/client/pkg/v3/types go.etcd.io/etcd/client/pkg/v3/verify -# go.etcd.io/etcd/client/v3 v3.6.11 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 +# go.etcd.io/etcd/client/v3 v3.6.11 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a ## explicit; go 1.25.0 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/concurrency go.etcd.io/etcd/client/v3/credentials go.etcd.io/etcd/client/v3/internal/endpoint go.etcd.io/etcd/client/v3/internal/resolver -# go.etcd.io/etcd/pkg/v3 v3.6.11 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 +# go.etcd.io/etcd/pkg/v3 v3.6.11 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a ## explicit; go 1.25.0 go.etcd.io/etcd/pkg/v3/adt go.etcd.io/etcd/pkg/v3/contention @@ -343,7 +343,7 @@ go.etcd.io/etcd/pkg/v3/runtime go.etcd.io/etcd/pkg/v3/schedule go.etcd.io/etcd/pkg/v3/traceutil go.etcd.io/etcd/pkg/v3/wait -# go.etcd.io/etcd/server/v3 v3.6.5 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 +# go.etcd.io/etcd/server/v3 v3.6.5 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a ## explicit; go 1.25.0 go.etcd.io/etcd/server/v3/auth go.etcd.io/etcd/server/v3/config @@ -1110,11 +1110,11 @@ sigs.k8s.io/yaml sigs.k8s.io/yaml/kyaml # github.com/openshift/microshift => ../ # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251120221002-696928a6a0d7 -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260508194201-c543fe153245 -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 -# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 -# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260508194201-c543fe153245 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260608152018-bf6c0094589a +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a +# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a +# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260608152018-bf6c0094589a # k8s.io/api => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/api # k8s.io/apiextensions-apiserver => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver # k8s.io/apimachinery => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery From fa3cd68591948f08600d4b51df37159f693c7fe5 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 10 Jun 2026 04:15:20 +0000 Subject: [PATCH 5/8] update component images --- packaging/crio.conf.d/10-microshift_amd64.conf | 2 +- packaging/crio.conf.d/10-microshift_arm64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 0c91250313..bc2042e60d 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -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:f80444cc3da6b00878bbbea034b4122d40e88ce47aa00486d6874d8a49a2dfd1" +pause_image = "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0b69d8c02c7d6231928b1737e74ee30ade20bce70887b6c7c1d68ae034bc9dcd" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index 94abad4415..2bc16bcbfc 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -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:a2216f75ff054a66023649e397c9571b31a63664962ec5aa4d19843e1855d105" +pause_image = "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:56ac733f8a19c57d0027aba6bebd7063d85f1cf1b6f474c0180cd8f7d862c71f" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From d87e0301fc7f04dfe726058049ca722cd66a5300 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 10 Jun 2026 04:15:22 +0000 Subject: [PATCH 6/8] update manifests --- .../multus/kustomization.x86_64.yaml | 4 ++-- .../multus/release-multus-aarch64.json | 2 +- .../multus/release-multus-x86_64.json | 6 +++--- .../kustomization.x86_64.yaml | 10 +++++----- .../release-olm-aarch64.json | 2 +- .../release-olm-x86_64.json | 8 ++++---- assets/release/release-aarch64.json | 8 ++++---- assets/release/release-x86_64.json | 18 +++++++++--------- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index 2346451573..89dcabff80 100644 --- a/assets/components/multus/kustomization.x86_64.yaml +++ b/assets/components/multus/kustomization.x86_64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:53ff24eb2aa039458a2b6063e7ad6d54a192047f2e683965938fdbc3af964081 + digest: sha256:457d82310a2ecd6823e5eb2a1650d14443c2730ecda4d62ad8b88d181f63463d - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:c0c398bbac716ad20b404521beb4e7b19065ca07b49d81842c6f0b7e4bfe8f9a + digest: sha256:db6025036ff280675e8d784ab0457acfcfa29ec4af35e823e64f04901d39da72 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index 0715ff5a0b..e989ae6e20 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "5.0.0-0.nightly-arm64-2026-06-09-012537" + "base": "5.0.0-0.nightly-arm64-2026-06-10-025037" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:12f6644c521588d72e607d5761c7fa3e9a73bb0aab88b08420a8c5e4d4236ec5", diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index dac0d7ffb1..702fdc0e29 100644 --- a/assets/components/multus/release-multus-x86_64.json +++ b/assets/components/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "5.0.0-0.nightly-2026-06-08-075337" + "base": "5.0.0-0.nightly-2026-06-09-112600" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:53ff24eb2aa039458a2b6063e7ad6d54a192047f2e683965938fdbc3af964081", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c0c398bbac716ad20b404521beb4e7b19065ca07b49d81842c6f0b7e4bfe8f9a" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:457d82310a2ecd6823e5eb2a1650d14443c2730ecda4d62ad8b88d181f63463d", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:db6025036ff280675e8d784ab0457acfcfa29ec4af35e823e64f04901d39da72" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 9f6854ae59..b607a5ae73 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:341f8ea2724f3487c90d649b64749f6fa2d5f97ca8f00dce227725e8bca03ef9 + digest: sha256:1e28d2b718e7ad024fd6ac20e5ec4ac5e30ebcc81c136b0c733165a47483625b - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:9b7343b0927caee13e51334c6d9e8d2d85e0f4c671f6a3d20de2b2076726f1aa + digest: sha256:cae1efda5b44d38b54fbc0fa7acee126a8334b4af380691f8c05981d27afb690 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:694eff563bee1f5c0366c51b9adb17f3ff563199075a162c1587639b04b6f918 + digest: sha256:cd84fae073953125e6eed47e7feacb146161df6d5222f5d899704686f917c50d patches: - patch: |- @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9b7343b0927caee13e51334c6d9e8d2d85e0f4c671f6a3d20de2b2076726f1aa + value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cae1efda5b44d38b54fbc0fa7acee126a8334b4af380691f8c05981d27afb690 - 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:341f8ea2724f3487c90d649b64749f6fa2d5f97ca8f00dce227725e8bca03ef9 + value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1e28d2b718e7ad024fd6ac20e5ec4ac5e30ebcc81c136b0c733165a47483625b target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 7b861b1a4d..7e3b68ea10 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "5.0.0-0.nightly-arm64-2026-06-09-012537" + "base": "5.0.0-0.nightly-arm64-2026-06-10-025037" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a65b0dcf06f57dd03e2569f33649f06bc51f0845ceea01ecb141b76eaea485c1", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index 6599de77ef..5179725c0b 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "5.0.0-0.nightly-2026-06-08-075337" + "base": "5.0.0-0.nightly-2026-06-09-112600" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:341f8ea2724f3487c90d649b64749f6fa2d5f97ca8f00dce227725e8bca03ef9", - "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9b7343b0927caee13e51334c6d9e8d2d85e0f4c671f6a3d20de2b2076726f1aa", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:694eff563bee1f5c0366c51b9adb17f3ff563199075a162c1587639b04b6f918" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1e28d2b718e7ad024fd6ac20e5ec4ac5e30ebcc81c136b0c733165a47483625b", + "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cae1efda5b44d38b54fbc0fa7acee126a8334b4af380691f8c05981d27afb690", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cd84fae073953125e6eed47e7feacb146161df6d5222f5d899704686f917c50d" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 1903ee4ded..7ceb44b017 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "5.0.0-0.nightly-arm64-2026-06-09-012537" + "base": "5.0.0-0.nightly-arm64-2026-06-10-025037" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:335cc4f16ae535d0d2e72206f63bba97db6c7f3d7ae8896842e179548e1db76b", "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9c3900c948954ad3c9206147f75a9cd3039e6e95947f4bf82ee994db9317202a", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:192be02391dc3a8ba2d2074063ed09b1a1a9780053f2d74230b5ba3776e542d3", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b3308350dc53d829dcdad213454159c207ecc634dd2378db4916dea3614c9c9c", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6f5dc0bdcbb044810e7b09b01f80df866b3c3af938bd150d818c2914344fb4b2", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:59eba69120cff661709251ed6c21cc5b53ec8f288b5576014f8d893705153e99", - "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a2216f75ff054a66023649e397c9571b31a63664962ec5aa4d19843e1855d105", + "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:56ac733f8a19c57d0027aba6bebd7063d85f1cf1b6f474c0180cd8f7d862c71f", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cbcbf4bacdc37322bfa70addad27cbc09d1d57dae05e0be5c0bdbab27fd4edc3", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:e77365e44676fbd8ab9e4ce53f3a406856bbdfef3467c545a7df1197d84477af", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d83e3dcf4ab1942ce4f2c24d1245e83e30c154bc70dd368b0affbd3da25f59d2" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a1d1ef4683809a939a4c7e44d459e141c9c1be5808bfba303fd7a422373a5070" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 63a11de88f..a79a10a009 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "5.0.0-0.nightly-2026-06-08-075337" + "base": "5.0.0-0.nightly-2026-06-09-112600" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:96c4bfe15029ca7ed406b4a0cb5c9baad5b0a4074f45227fa2471613cd9f18f7", - "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:7855fc379cb5132a46297e8eb1ab6ef79519c6c5b7197a67efe92f9c4446a77d", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b6328004015f0b0367b4f345a8a985fbe7310ae06f8a6d16ce798ee5c7bc899e", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:694eff563bee1f5c0366c51b9adb17f3ff563199075a162c1587639b04b6f918", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:434a1eb0d9d8cfa841791514bd4cafe51e27b2ba3cb52ee906a0bde5b300c1b8", - "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f80444cc3da6b00878bbbea034b4122d40e88ce47aa00486d6874d8a49a2dfd1", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1f972056e73eae5769a2aef0a68f8ea0ad796c953e7a03909cda2312fb759a62", + "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:4e9157049bcb87590c356e522fb74ddb350b5f6e375f2007e36b20ecc841cd13", + "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3707f170213eda5d37f45c8f2f5605c3d4db80acd55f3b7943d90ad0248f8582", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:39fdc41a150c6665c192f1ec06563c5c1f7b8f65e8377a5e2d16cf495c5bca50", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cd84fae073953125e6eed47e7feacb146161df6d5222f5d899704686f917c50d", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:78d59d56dd6fb55ffa858fc96f7e67193a28b3baac9cfca46ee1b6a1a4e1bca4", + "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0b69d8c02c7d6231928b1737e74ee30ade20bce70887b6c7c1d68ae034bc9dcd", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:065512cd13378b366cd1adad78b9047f099bd777dccd0dbb4a99f25f504381e4", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:10c9ccab4f2857d113b55e12cac29aed0dc97d5a4e29ed2e4ea0f77551ee55f8", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:5e138693e4635a21ec4b037759ec023a72102601cd43af51512bc5ca589d266a" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c254280d6a89ed1d0c570544fd1ae40e804fc3c81dc671d161e56bb922add9e9" } } From a6f9d524e881e54de6a93d793e787f6b0a1d1700 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 10 Jun 2026 04:15:28 +0000 Subject: [PATCH 7/8] update buildfiles --- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index f48a340760..ff987370b4 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 5.0.0-0.nightly-arm64-2026-06-09-012537 +OCP_VERSION := 5.0.0-0.nightly-arm64-2026-06-10-025037 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index e02d2c509c..a931f60b4f 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 5.0.0-0.nightly-2026-06-08-075337 +OCP_VERSION := 5.0.0-0.nightly-2026-06-09-112600 From 5ce3059a03b5e580c9e7bfd53ee6386a8a4af175 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 10 Jun 2026 04:15:54 +0000 Subject: [PATCH 8/8] Update AI Model Serving for MicroShift --- .../ai-model-serving/release-ai-model-serving-x86_64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json b/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json index fddd860d40..8af09d48b7 100644 --- a/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json +++ b/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "2.25.6" + "base": "2.25.7" }, "images": { "ray-tls-generator-image": "registry.redhat.io/ubi9/ubi-minimal:latest",