From 91ea22505312fb4f59e90387c121fe8f0b79ce0f Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 6 Mar 2026 04:26:16 +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 9cc99f9d32..59b4d1782c 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:4.22.0-0.nightly-2026-03-02-153725" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-03-05-024021" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-03-05-070435" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-03-06-030256" From bbf256d9e123d0c0dbd453c21eef35bf9437c1af Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 6 Mar 2026 04:26:16 +0000 Subject: [PATCH 2/8] update changelog --- scripts/auto-rebase/changelog.txt | 162 +++++++++++++++++------------- scripts/auto-rebase/commits.txt | 34 +++---- 2 files changed, 110 insertions(+), 86 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index dd7b70702f..e1c0a52bf9 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,82 +1,97 @@ -- api embedded-component 64dddb8f3186537f3682b7e735f1cc392196a101 to 9b2ee997d297702c53d26185becda97e8f003f44 - - 9c5267b1 2026-02-27T15:59:12Z Add platform-specific feature gates for CAPI Operator features - - b81d2a16 2026-02-26T21:43:01-05:00 feat: add link to sippy for tests - - 9b8f43c8 2026-02-26T09:44:16-08:00 Promote ClusterAPIMachineManagementVSphere to TechPreview - - 74577ddf 2026-02-25T16:57:44Z ClusterAPI revision components can be empty - - 3cfb57ea 2026-02-25T16:54:05Z Require APIExcludedFields Versions to be set - - a58ab739 2026-02-09T17:35:08Z OCPBUGS-32275: Add ingress.spec.domain validation - -- cluster-dns-operator embedded-component 5d7c973968909d4155796363222f6edc001e19a3 to 979dca867681e4121155d586fc9c374745d0d6e0 - - 0b50f72 2026-02-25T15:05:58Z Add NI&D team members to OWNERS - - 7ba9264 2026-02-11T15:41:57Z Bump base images from 4.21 to 4.22 - - d08fbd6 2026-01-14T09:11:55+01:00 OCPBUGS-65498: Add openshift-dns-operator ClusterRole to ClusterOperator relatedObjects - - c72db7b 2025-11-11T15:58:57+01:00 manifests: Enable user namespaces - -- cluster-kube-apiserver-operator embedded-component bf2d69223e840eed1c3ad73eb7145c6d8c747fa8 to ee1aaf0b8169bbd19a297ce34bca4eff3698e8f0 - - 890526a 2026-02-26T07:52:43-05:00 Revert "Merge pull request #2032 from ricardomaraschini/CNTRLPLANE-2622" - - 5ee2e85 2026-02-19T13:48:19+05:30 Fixing bound sa token test - -- cluster-kube-controller-manager-operator embedded-component 99f17e64c5e623f5e909418d6690214f5583f6c2 to 1d852bde83bf699297a6164d131b78343d922afd - - 16022e4 2026-01-17T11:22:43Z Updating ose-cluster-kube-controller-manager-operator-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/37a25cc2e6eec9883ae439d785f89ab3f6cb2f51/images/ose-cluster-kube-controller-manager-operator.yml - -- cluster-network-operator embedded-component b1c55d71bfc33a4e2aba1083c0eed1ff698a84c5 to 1c1a0978d85b2a582f12690ed89fc7cb5b261744 - - 44ebf06 2026-02-19T12:54:45-08:00 fix more transient error condtions caused Degraded - -- csi-external-snapshotter embedded-component d20b90a92cd7d77166319f5bc2feb80623747d28 to 7c9f2f4695042e415747e94d77cbbcc11c59c6cf - - f689ea8 2026-02-27T21:30:09+08:00 UPSTREAM: : restore log level of the group snapshot reconciler - - 8025819 2026-02-26T13:10:51Z UPSTREAM: : Updating ose-csi-external-snapshotter-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/cb57200ffcd7ad506814eaf8c941fed0481fe837/images/ose-csi-external-snapshotter.yml - -- kubernetes-kube-storage-version-migrator embedded-component 73b468abf83d3d5894534f5d5cc42d1cad2a9045 to a740e5343a8b0944074c80a72fa3433b21864b35 - - 8591d56 2026-01-16T20:26:36Z UPSTREAM: : Updating ose-kube-storage-version-migrator-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/37a25cc2e6eec9883ae439d785f89ab3f6cb2f51/images/ose-kube-storage-version-migrator.yml - -- machine-config-operator embedded-component b8e0c0c1dd6cb646740fc3deed65bfd41b15a04f to 297cce4e5c79285b9fcf2a939f1034894d7a9f2c - - ccdcea07 2026-02-27T18:16:28Z chore: update AMIs - - 33b1adb0 2026-02-27T11:18:50-05:00 remove ManagedBootImages* feature gates - - 2bc7ceef 2026-02-25T14:37:17-05:00 bootimage: remove URL in vsphere login failure log - - 0e1d4a4e 2026-02-24T20:11:08-05:00 Increate timeout for sharded ocl test - - cd13fea7 2026-02-05T17:35:21-05:00 Remove lingering references to openshift-sdn - -- operator-framework-olm embedded-component af1eb8f8acc2959c5a722467e880cac66ce5246b to 248492dba7f542d4bf68004f85218137bba987d1 - - e537de8b 2026-02-25T16:09:35-05:00 Remove aliases and selectors from NetworkPolicy tests - - 16791e3c 2026-02-25T13:40:49-05:00 Update downstream NetworkPolicies for HyperShift - - a1e313a8 2026-02-25T09:31:52-05:00 update the network policy port per new change - - 49626b5a 2026-02-24T00:07:53Z OCPBUGS-76971: Update NetworkPolicy egress to support HyperShift custom API ports (#3770) - - bf18ea54 2026-02-24T00:06:50Z MON-4513: Use endpointslices for metrics (#3773) - - f265c6b5 2026-02-24T00:06:32Z abandon evaluation of any new catalogsource image which is pathological (#3766) - - 801784ae 2026-02-24T00:06:14Z :seedling: Bump google.golang.org/grpc from 1.78.0 to 1.79.1 (#3772) - - 96af84cf 2026-02-24T00:05:56Z :seedling: Bump the k8s-dependencies group with 9 updates (#3771) - - 5ec11c1d 2026-02-24T00:05:22Z :seedling: Bump golang.org/x/net from 0.49.0 to 0.50.0 (#3764) - - a266010b 2026-02-24T00:05:03Z Auto-generate OpenAPIModelName() via openapi-gen (#3769) - - 38b6af53 2026-02-24T00:04:38Z add rashmigottipati as a reviewer (#3768) - - 8c1de022 2026-02-24T00:04:11Z remove incompatible licensing statements (#3767) - - 551e315b 2026-02-24T00:03:51Z fix: add OpenAPIModelName for all PackageManifest related types (#3765) - -- csi-external-snapshotter image-amd64 d20b90a92cd7d77166319f5bc2feb80623747d28 to 7c9f2f4695042e415747e94d77cbbcc11c59c6cf - - f689ea8 2026-02-27T21:30:09+08:00 UPSTREAM: : restore log level of the group snapshot reconciler - - 8025819 2026-02-26T13:10:51Z UPSTREAM: : Updating ose-csi-external-snapshotter-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/cb57200ffcd7ad506814eaf8c941fed0481fe837/images/ose-csi-external-snapshotter.yml - -- kube-rbac-proxy image-amd64 c7ab76fd6fdf651d5022db8946c35b158ecc2396 to bdd87a0646eae5683bb83fe30e3649471b757ebf - - 8b1c864 2026-02-26T12:55:56Z Updating kube-rbac-proxy-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/cb57200ffcd7ad506814eaf8c941fed0481fe837/images/kube-rbac-proxy.yml - -- oc image-arm64 5cbfaa519ec55b8ac7217b316061cb904381ab91 to dcdd63608b569e5710cdcc5f0882a95796d925c7 +- api embedded-component 9b2ee997d297702c53d26185becda97e8f003f44 to 09d04f823a63db0fb0f5c0404081d438dd5a8d44 + - 1bd464b2 2026-03-04T16:47:07Z LabelSelector should have omitzero + - 91c9cba7 2026-03-03T18:06:57+05:30 Add new generate-tests claude command + - e54c5804 2026-03-03T10:09:26+01:00 Add additional storage configuration fields to ContainerRuntimeConfig + - aeae1824 2026-03-02T08:10:28-08:00 bump(k8s): make update + - c63fe74a 2026-03-02T08:10:27-08:00 bump(k8s): update builder images + - 3410e77e 2026-03-02T08:10:27-08:00 bump(k8s): tools: align to new upstream function for getting openapi targets for codegen + - d7bb63f3 2026-03-02T08:10:27-08:00 bump(k8s): go mod vendor + - 6c291957 2026-03-02T08:10:01-08:00 bump(k8s): tools: go mod vendor + - abd7943b 2026-03-02T08:10:00-08:00 bump(k8s): update k8s.io/* dependencies to v1.35.1 + - da663ed9 2026-02-27T10:22:40-08:00 bump(k8s): tools: update k8s.io/* dependencies to v1.35.1 + +- cluster-dns-operator embedded-component 979dca867681e4121155d586fc9c374745d0d6e0 to 2acb1912070d2c76afe869facc97565964572b66 + - 675fb67 2026-03-02T09:03:30-03:00 bump base image + - 11c3aca 2026-03-02T09:03:14-03:00 bump coredns-ocp-dnsnameresolver + - d9bc0f8 2026-03-02T09:03:10-03:00 bump k8s libraries to v0.35.0 and cr to v0.23.1 + +- cluster-ingress-operator embedded-component add0516e322140127200057716ea9f9080b19fa4 to 134fce90180992e3011809f0d84d536c053a219e + - 70bab84 2026-03-03T13:46:29-03:00 remove RouteExternalCertificate feature gate + - 41dc31c 2026-02-27T15:31:20Z ensure canary daemon set uses its own service account. + +- cluster-kube-apiserver-operator embedded-component ee1aaf0b8169bbd19a297ce34bca4eff3698e8f0 to 57b8b8705fdaab6aa4a45a0353cbfd0217fc57f9 + - 20e53dc 2026-03-03T09:39:06-08:00 bump(k8s): pod security evaluator now requires an emulation version - using latest + - 7dd5b01 2026-03-03T09:39:06-08:00 bump(k8s): bump builder image version + - 4672fa2 2026-03-03T09:39:05-08:00 bump(k8s): go mod vendor + - ee4c008 2026-03-03T09:38:30-08:00 bump(k8s): update k8s.io/* dependencies to v1.35.0 + +- cluster-kube-controller-manager-operator embedded-component 1d852bde83bf699297a6164d131b78343d922afd to a7ff6a4647805362618c61a031196cc791cb9963 + - 4b3225d 2026-03-03T09:44:29-08:00 bump(k8s): bump builder image version + - 1bd9904 2026-03-03T09:44:29-08:00 bump(k8s): go mod vendor + - f10a460 2026-03-03T09:43:18-08:00 bump(k8s): update k8s.io/* dependencies to v1.35.1 + +- cluster-kube-scheduler-operator embedded-component 820d82bbc61c739c6c95a450cdbc454b5e6cd1fc to 3fe8a24ab5e6f6420181b572e3e43670a5fb1ca1 + - abac17d 2026-03-03T09:41:19-08:00 bump(k8s): bump builder image version + - 3df2b5e 2026-03-03T09:41:19-08:00 bump(k8s): go mod vendor + - d608ce6 2026-03-03T09:40:48-08:00 bump(k8s): update k8s.io/* dependencies to v1.35.1 + - f1311bb 2026-03-03T14:44:01+01:00 chore: update OWNERS + +- cluster-network-operator embedded-component 1c1a0978d85b2a582f12690ed89fc7cb5b261744 to 42bb9ee08326a4994b403b5750f4e3f180a4735f + - 7dc793f 2026-02-24T15:46:47+05:30 Add ValidatingAdmissionPolicy for EgressIP + +- csi-external-snapshotter embedded-component 7c9f2f4695042e415747e94d77cbbcc11c59c6cf to 698eb2c97de7d16ffc0bde7eaaba22f761664dee + - 48eb703 2026-03-03T18:33:57Z UPSTREAM: : Updating ose-csi-snapshot-controller-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/56cb39ad358cdec1db7c84ea1919fe8849c2550b/images/ose-csi-snapshot-controller.yml + +- kubernetes-kube-storage-version-migrator embedded-component a740e5343a8b0944074c80a72fa3433b21864b35 to 72835e43c7754356645e41031f3a99926b4d42e6 + - 370719b 2026-02-19T09:59:04-05:00 UPSTREAM: : add leaderelection + - 46d2346 2026-01-29T17:23:07-05:00 UPSTREAM: : update vendor + +- machine-config-operator embedded-component 297cce4e5c79285b9fcf2a939f1034894d7a9f2c to d6719e59154b61300e40056a99b629d9a713ef69 + - d650e25a 2026-03-02T10:25:15-05:00 bootimage: fix failure domain matching + - b590a085 2026-02-27T10:37:44-05:00 set the OWNERS for the IRI e2e test folder + - 0d66bcd7 2026-02-27T10:37:28-05:00 skip e2e tests that cannot be run in the openshift CI environment + - 19582524 2026-02-27T13:17:11Z NO-ISSUE:dont execute tls tests until OCPBUGS-76990 is fixed + +- operator-framework-olm embedded-component 248492dba7f542d4bf68004f85218137bba987d1 to b51083fdf05c74e2d798761488dd1a07ba7c6d8c + - 17b9c25f 2026-03-03T00:10:40Z Upgrade from go 1.25.3 to 1.25.7 (#474) + - 4c677581 2026-03-03T00:09:56Z Add OpenAPIModelName() generation for v1alpha1 and lib/version types (#477) + - 074f9aa8 2026-03-03T00:09:41Z add bundle relatedimage image pullspec validation (#475) + - 363f3c92 2026-03-03T00:09:26Z Bump the k8s-dependencies group with 4 updates (#478) + - 3bf5ed39 2026-03-03T00:09:11Z bumping api to capture go bumps across the whole o-f set (#1921) + - 495287c2 2026-03-03T00:08:56Z Bump actions/upload-artifact from 6 to 7 (#1920) + - e1d46dd7 2026-03-03T00:08:40Z Bump actions/download-artifact from 7 to 8 (#1919) + - cf0b109b 2026-03-03T00:08:26Z Bump github.com/operator-framework/api from 0.39.0 to 0.40.0 (#1917) + - e8668e30 2026-03-03T00:08:11Z Update to go 1.25.7 (#1918) + - 201e7fb3 2026-03-03T00:07:56Z handle cases where spec.version.release is a number instead of string (#1909) + - e601b841 2026-03-03T00:07:41Z adding olm.bundle image/relatedImages pullspec format validation (#1905) + - f0d196df 2026-03-03T00:07:26Z Bump google.golang.org/grpc from 1.79.0 to 1.79.1 (#1916) + - 8f772d69 2026-03-03T00:07:11Z Bump google.golang.org/grpc from 1.78.0 to 1.79.0 (#1915) + - afdf672e 2026-03-03T00:06:55Z Bump the k8s-dependencies group with 4 updates (#1912) + - c78e67df 2026-03-03T00:06:40Z Bump github.com/mattn/go-sqlite3 from 1.14.33 to 1.14.34 (#1913) + - bf06fb9a 2026-03-03T00:06:26Z Bump the golang-x-deps group across 1 directory with 3 updates (#1911) + - 18493040 2026-03-03T00:06:11Z Bump github.com/grpc-ecosystem/grpc-health-probe from 0.4.44 to 0.4.45 (#1908) + - c27f75f1 2026-03-03T00:05:56Z Bump go.podman.io/common from 0.66.1 to 0.67.0 (#1907) + - bfdb3d66 2026-03-03T00:05:41Z Bump google.golang.org/grpc/cmd/protoc-gen-go-grpc from 1.6.0 to 1.6.1 (#1903) + - 3d21e21f 2026-03-03T00:05:26Z Add pedjak to OWNERS (#1902) + - b22b649e 2026-03-03T00:05:05Z bumping o-f components (#3779) + - ec491277 2026-03-03T00:04:48Z Update operator-framework/api to v0.40.0 (#3777) + - 49d886f8 2026-03-03T00:04:28Z Bump goreleaser/goreleaser-action from 6 to 7 (#3775) + - 12a2c954 2026-03-03T00:04:09Z fix: upgrade Go to 1.25.7 to resolve CVE-2025-68121 (#3776) + +- oc image-amd64 5cbfaa519ec55b8ac7217b316061cb904381ab91 to dcdd63608b569e5710cdcc5f0882a95796d925c7 - 57a74e4c 2026-03-03T09:39:57-05:00 images/tools/Dockerfile: Just install it and if it fails fall back to iotop-c - 02339fc4 2026-03-03T14:40:18+01:00 Allow periods in display name labels for version validation - 189ac91b 2026-02-19T12:21:23-05:00 Update Dockerfile to work on CentOS/RHEL 10 - 2bd770b8 2026-02-12T12:01:40+05:30 fixing oc cli failures - c9f1f7c6 2026-02-06T12:45:09+01:00 pkg/helpers: Print the right error object -- csi-external-snapshotter image-arm64 d20b90a92cd7d77166319f5bc2feb80623747d28 to 698eb2c97de7d16ffc0bde7eaaba22f761664dee +- csi-external-snapshotter image-amd64 7c9f2f4695042e415747e94d77cbbcc11c59c6cf to 698eb2c97de7d16ffc0bde7eaaba22f761664dee - 48eb703 2026-03-03T18:33:57Z UPSTREAM: : Updating ose-csi-snapshot-controller-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/56cb39ad358cdec1db7c84ea1919fe8849c2550b/images/ose-csi-snapshot-controller.yml - - f689ea8 2026-02-27T21:30:09+08:00 UPSTREAM: : restore log level of the group snapshot reconciler - - 8025819 2026-02-26T13:10:51Z UPSTREAM: : Updating ose-csi-external-snapshotter-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/cb57200ffcd7ad506814eaf8c941fed0481fe837/images/ose-csi-external-snapshotter.yml -- router image-arm64 d8ed3559fd4808a4f10c927ba4a199d3fd5b84a2 to a7f351b6bbc67c322fc37a47da0c0674a4a19ac4 +- router image-amd64 d8ed3559fd4808a4f10c927ba4a199d3fd5b84a2 to a7f351b6bbc67c322fc37a47da0c0674a4a19ac4 - c08455a 2026-03-03T18:34:31-03:00 remove RouteExternalCertificate feature gate -- kube-rbac-proxy image-arm64 c7ab76fd6fdf651d5022db8946c35b158ecc2396 to bdd87a0646eae5683bb83fe30e3649471b757ebf - - 8b1c864 2026-02-26T12:55:56Z Updating kube-rbac-proxy-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/cb57200ffcd7ad506814eaf8c941fed0481fe837/images/kube-rbac-proxy.yml - -- ovn-kubernetes image-arm64 517194700aba68ee6ad222841e312e0c29899e73 to e69a72608af037a70a5e44a410f1c9c7eb6c2f97 +- ovn-kubernetes image-amd64 517194700aba68ee6ad222841e312e0c29899e73 to e69a72608af037a70a5e44a410f1c9c7eb6c2f97 - c79a4600 2026-02-25T14:14:03-08:00 make new tests informing by default - 515d4c74 2026-02-11T17:46:31-05:00 Fixes e2e sflow test - 95c0a261 2026-02-11T16:57:31+01:00 Fix asynchronous race with nad controller UT @@ -143,3 +158,12 @@ - 3e6b2a3d 2026-01-27T21:10:43+09:00 parallelize multi-platform Docker image builds - 7d408c1c 2026-01-21T15:38:23+01:00 Remove IC zone migration HACK code +- oc image-arm64 dcdd63608b569e5710cdcc5f0882a95796d925c7 to 4aebabfa7bfd7c68f4b06601246daad782741070 + - 014fa165 2026-02-27T09:57:53-08:00 pkg/cli/admin/upgrade/recommend/alerts: Add VMCannotBeEvicted + - ba31c88d 2026-02-27T09:57:25-08:00 pkg/cli/admin/upgrade/recommend/alerts: Add openShiftUpdatePrecheck label + - 4a969c1e 2026-02-27T09:56:59-08:00 pkg/cli/admin/upgrade/recommend/alerts: Add VirtHandlerDaemonSetRolloutFailing + - 2899d2b0 2026-02-23T10:20:56-08:00 pkg/cli/admin/upgrade/recommend/alerts: Add KubeletHealthState + +- ovn-kubernetes image-arm64 e69a72608af037a70a5e44a410f1c9c7eb6c2f97 to eedfcd073cbae0eea97638716019b2b39f141a41 + - 14b73098 2026-02-23T09:21:35+01:00 Minimize ACLs by combining ipBlocks into single ACL + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 998d9a91b0..a80b1dfc12 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,35 +1,35 @@ -https://github.com/openshift/api embedded-component 9b2ee997d297702c53d26185becda97e8f003f44 +https://github.com/openshift/api embedded-component 09d04f823a63db0fb0f5c0404081d438dd5a8d44 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 7b6335396677dfd392dc72e1f1bbb5afcfa74a44 -https://github.com/openshift/cluster-dns-operator embedded-component 979dca867681e4121155d586fc9c374745d0d6e0 -https://github.com/openshift/cluster-ingress-operator embedded-component add0516e322140127200057716ea9f9080b19fa4 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component ee1aaf0b8169bbd19a297ce34bca4eff3698e8f0 -https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 1d852bde83bf699297a6164d131b78343d922afd -https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 820d82bbc61c739c6c95a450cdbc454b5e6cd1fc -https://github.com/openshift/cluster-network-operator embedded-component 1c1a0978d85b2a582f12690ed89fc7cb5b261744 +https://github.com/openshift/cluster-dns-operator embedded-component 2acb1912070d2c76afe869facc97565964572b66 +https://github.com/openshift/cluster-ingress-operator embedded-component 134fce90180992e3011809f0d84d536c053a219e +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 57b8b8705fdaab6aa4a45a0353cbfd0217fc57f9 +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component a7ff6a4647805362618c61a031196cc791cb9963 +https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 3fe8a24ab5e6f6420181b572e3e43670a5fb1ca1 +https://github.com/openshift/cluster-network-operator embedded-component 42bb9ee08326a4994b403b5750f4e3f180a4735f https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component ec06b68a376c9ddbab8e9d85347cfb5dadcea0bf https://github.com/openshift/cluster-policy-controller embedded-component 8b775487512fb543bff470ff1042bd3ac31b29be -https://github.com/openshift/csi-external-snapshotter embedded-component 7c9f2f4695042e415747e94d77cbbcc11c59c6cf +https://github.com/openshift/csi-external-snapshotter embedded-component 698eb2c97de7d16ffc0bde7eaaba22f761664dee https://github.com/openshift/etcd embedded-component 6a0992267004177e385e35b91e186635a644dbfe https://github.com/openshift/kubernetes embedded-component 047d96223dd843e9d54bed59bc212d2e9122c56a -https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component a740e5343a8b0944074c80a72fa3433b21864b35 -https://github.com/openshift/machine-config-operator embedded-component 297cce4e5c79285b9fcf2a939f1034894d7a9f2c +https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 72835e43c7754356645e41031f3a99926b4d42e6 +https://github.com/openshift/machine-config-operator embedded-component d6719e59154b61300e40056a99b629d9a713ef69 https://github.com/openshift/openshift-controller-manager embedded-component 19ac71374ea7d42957fe0eb3cc6d38679cc257e1 -https://github.com/openshift/operator-framework-olm embedded-component 248492dba7f542d4bf68004f85218137bba987d1 +https://github.com/openshift/operator-framework-olm embedded-component b51083fdf05c74e2d798761488dd1a07ba7c6d8c https://github.com/openshift/route-controller-manager embedded-component 624742d93f3a7885cf7f70985f1e23ff60da580d https://github.com/openshift/service-ca-operator embedded-component 503e4f5f4c74fd095a8dca385541125f3c9ee28b -https://github.com/openshift/oc image-amd64 5cbfaa519ec55b8ac7217b316061cb904381ab91 +https://github.com/openshift/oc image-amd64 dcdd63608b569e5710cdcc5f0882a95796d925c7 https://github.com/openshift/coredns image-amd64 9798af8539c27ad02bd376006cd3a9a7b23e5966 -https://github.com/openshift/csi-external-snapshotter image-amd64 7c9f2f4695042e415747e94d77cbbcc11c59c6cf -https://github.com/openshift/router image-amd64 d8ed3559fd4808a4f10c927ba4a199d3fd5b84a2 +https://github.com/openshift/csi-external-snapshotter image-amd64 698eb2c97de7d16ffc0bde7eaaba22f761664dee +https://github.com/openshift/router image-amd64 a7f351b6bbc67c322fc37a47da0c0674a4a19ac4 https://github.com/openshift/kube-rbac-proxy image-amd64 bdd87a0646eae5683bb83fe30e3649471b757ebf -https://github.com/openshift/ovn-kubernetes image-amd64 517194700aba68ee6ad222841e312e0c29899e73 +https://github.com/openshift/ovn-kubernetes image-amd64 e69a72608af037a70a5e44a410f1c9c7eb6c2f97 https://github.com/openshift/kubernetes image-amd64 047d96223dd843e9d54bed59bc212d2e9122c56a https://github.com/openshift/service-ca-operator image-amd64 503e4f5f4c74fd095a8dca385541125f3c9ee28b -https://github.com/openshift/oc image-arm64 dcdd63608b569e5710cdcc5f0882a95796d925c7 +https://github.com/openshift/oc image-arm64 4aebabfa7bfd7c68f4b06601246daad782741070 https://github.com/openshift/coredns image-arm64 9798af8539c27ad02bd376006cd3a9a7b23e5966 https://github.com/openshift/csi-external-snapshotter image-arm64 698eb2c97de7d16ffc0bde7eaaba22f761664dee https://github.com/openshift/router image-arm64 a7f351b6bbc67c322fc37a47da0c0674a4a19ac4 https://github.com/openshift/kube-rbac-proxy image-arm64 bdd87a0646eae5683bb83fe30e3649471b757ebf -https://github.com/openshift/ovn-kubernetes image-arm64 e69a72608af037a70a5e44a410f1c9c7eb6c2f97 +https://github.com/openshift/ovn-kubernetes image-arm64 eedfcd073cbae0eea97638716019b2b39f141a41 https://github.com/openshift/kubernetes image-arm64 047d96223dd843e9d54bed59bc212d2e9122c56a https://github.com/openshift/service-ca-operator image-arm64 503e4f5f4c74fd095a8dca385541125f3c9ee28b From 31063b910ab2aa1f1f3243f833092b50fb3bdaec Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 6 Mar 2026 04:27:51 +0000 Subject: [PATCH 3/8] update microshift/go.mod --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 25d0abc51b..aa505d35d4 100644 --- a/go.mod +++ b/go.mod @@ -225,7 +225,7 @@ replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251001123353-fd5b1fb35db1 // from kubernetes k8s.io/klog/v2 => ./deps/k8s.io/klog // deps clone github.com/kubernetes/klog from kubernetes k8s.io/kubernetes => ./deps/github.com/openshift/kubernetes // deps copy - sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260226203502-a740e5343a8b // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator + sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260304192652-72835e43c775 // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator ) replace ( diff --git a/go.sum b/go.sum index 620c080d58..c9b04ed257 100644 --- a/go.sum +++ b/go.sum @@ -281,8 +281,8 @@ github.com/openshift/client-go v0.0.0-20251205093018-96a6cbc1420c h1:TBE0Gl+oCo/ github.com/openshift/client-go v0.0.0-20251205093018-96a6cbc1420c/go.mod h1:IsynOWZAfdH+BgWimcFQRtI41Id9sgdhsCEjIk8ACLw= github.com/openshift/cluster-policy-controller v0.0.0-20251120141414-8b775487512f h1:qL/G4RbBeYWNBeZ8XIhB6MAOh1rld7HWUAue22l0cw8= github.com/openshift/cluster-policy-controller v0.0.0-20251120141414-8b775487512f/go.mod h1:LXi/198uMe/91uydJ/yHz+jS66JCP1DtSonVDFhVVPs= -github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260226203502-a740e5343a8b h1:MOPgMyH3XLYEvWGNL1UUzgKN6oRX9Fe0XPxo/W0O+rE= -github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260226203502-a740e5343a8b/go.mod h1:o5cKv/pQ+exEYKq97WapNa5cxSPxuwBezHZHNW5RNRo= +github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260304192652-72835e43c775 h1:4gZibdvRUsxsQ55Tp+HFRjVzkYh+bcRezmYqhiCMk4U= +github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260304192652-72835e43c775/go.mod h1:o5cKv/pQ+exEYKq97WapNa5cxSPxuwBezHZHNW5RNRo= github.com/openshift/library-go v0.0.0-20260121132910-dc3a1c884c04 h1:Fm9C8pT4l6VjpdqdhI1cBX9Y3D3S+rFxptVhCPBbMAI= github.com/openshift/library-go v0.0.0-20260121132910-dc3a1c884c04/go.mod h1:nIzWQQE49XbiKizVnVOip9CEB7HJ0hoJwNi3g3YKnKc= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251001123353-fd5b1fb35db1 h1:PMTgifBcBRLJJiM+LgSzPDTk9/Rx4qS09OUrfpY6GBQ= From 4fa42a36256970f33037be691e3550b298ad0da6 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 6 Mar 2026 04:28:16 +0000 Subject: [PATCH 4/8] update microshift/vendor --- vendor/modules.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/modules.txt b/vendor/modules.txt index ad9319db54..be4a4e7751 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -3139,7 +3139,7 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client ## explicit; go 1.23 sigs.k8s.io/json sigs.k8s.io/json/internal/golang/encoding/json -# sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260226203502-a740e5343a8b +# sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260304192652-72835e43c775 ## explicit; go 1.24.0 sigs.k8s.io/kube-storage-version-migrator/pkg/apis/migration/v1alpha1 sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset @@ -3247,7 +3247,7 @@ sigs.k8s.io/yaml/kyaml # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251001123353-fd5b1fb35db1 # k8s.io/klog/v2 => ./deps/k8s.io/klog # k8s.io/kubernetes => ./deps/github.com/openshift/kubernetes -# sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260226203502-a740e5343a8b +# sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260304192652-72835e43c775 # 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 5dfb42811e577cf4ff4104f4ee507ce5706396b3 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 6 Mar 2026 04:28:22 +0000 Subject: [PATCH 5/8] update etcd/vendor --- .../microshift/pkg/config/apiserver.go | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/etcd/vendor/github.com/openshift/microshift/pkg/config/apiserver.go b/etcd/vendor/github.com/openshift/microshift/pkg/config/apiserver.go index 54f6b29129..54fb5b18dc 100644 --- a/etcd/vendor/github.com/openshift/microshift/pkg/config/apiserver.go +++ b/etcd/vendor/github.com/openshift/microshift/pkg/config/apiserver.go @@ -150,14 +150,15 @@ var RequiredFeatureGates = []string{"UserNamespacesSupport", "UserNamespacesPodS type FeatureGates struct { FeatureSet string `json:"featureSet"` - // CustomNoUpgrade is used to enable/disable feature gates. When the enabled or disable lists are not empty, x- and y-stream upgrades will be blocked. - // Use this field exclusively for custom feature gates, unless you are certain that the feature gate is a SpecialHandlingSupportExceptionRequired feature. + // CustomNoUpgrade is used to enable/disable feature gates that block x- and y-stream upgrades. CustomNoUpgrade EnableDisableFeatures `json:"customNoUpgrade"` - // SpecialHandlingSupportExceptionRequired allows for feature gates to be exempted from blocking x- and y-stream upgrades. + // SpecialHandlingSupportExceptionRequired is used to enable/disable feature gates that are exempt from blocking x- and y-stream upgrades. + // Features listed here do not need to be duplicated in CustomNoUpgrade. SpecialHandlingSupportExceptionRequired EnableDisableFeatures `json:"specialHandlingSupportExceptionRequired"` } // ToApiserverArgs converts the FeatureGates struct to a list of feature-gates arguments for the kube-apiserver. +// Features from both CustomNoUpgrade and SpecialHandlingSupportExceptionRequired are included. // Validation checks should be performed before calling this function to ensure the FeatureGates struct is valid. func (fg FeatureGates) ToApiserverArgs() ([]string, error) { ret := sets.NewString() @@ -169,12 +170,14 @@ func (fg FeatureGates) ToApiserverArgs() ([]string, error) { addFeatures(fg.CustomNoUpgrade.Enabled, true) addFeatures(fg.CustomNoUpgrade.Disabled, false) + addFeatures(fg.SpecialHandlingSupportExceptionRequired.Enabled, true) + addFeatures(fg.SpecialHandlingSupportExceptionRequired.Disabled, false) return ret.List(), nil } -// Implement the GoStringer interface for better %#v printing func (fg FeatureGates) GoString() string { - return fmt.Sprintf("FeatureGates{FeatureSet: %q, CustomNoUpgrade: %#v}", fg.FeatureSet, fg.CustomNoUpgrade) + return fmt.Sprintf("FeatureGates{FeatureSet: %q, CustomNoUpgrade: %#v, SpecialHandlingSupportExceptionRequired: %#v}", + fg.FeatureSet, fg.CustomNoUpgrade, fg.SpecialHandlingSupportExceptionRequired) } // validateFeatureGates validates the FeatureGates struct according to the following rules: @@ -202,8 +205,9 @@ func (fg *FeatureGates) validateFeatureGates() error { enabledCustom := sets.New(fg.CustomNoUpgrade.Enabled...) disabledCustom := sets.New(fg.CustomNoUpgrade.Disabled...) + enabledSpecial := sets.New(fg.SpecialHandlingSupportExceptionRequired.Enabled...) + disabledSpecial := sets.New(fg.SpecialHandlingSupportExceptionRequired.Disabled...) - // checkFeatureGateConflict checks if two sets of feature gates have any intersection and returns an error if they do. checkFeatureGateConflict := func(a, b sets.Set[string], errorMsg string) error { if intersect := a.Intersection(b); intersect.Len() > 0 { return fmt.Errorf("%s: %s", errorMsg, intersect.UnsortedList()) @@ -211,13 +215,18 @@ func (fg *FeatureGates) validateFeatureGates() error { return nil } + requiredGates := sets.New(RequiredFeatureGates...) conflictChecks := []struct { setA sets.Set[string] setB sets.Set[string] msg string }{ - {disabledCustom, sets.New(RequiredFeatureGates...), "required feature gates cannot be disabled"}, - {enabledCustom, disabledCustom, "feature gates cannot be both enabled and disabled"}, + {disabledCustom, requiredGates, "required feature gates cannot be disabled"}, + {disabledSpecial, requiredGates, "required feature gates cannot be disabled"}, + {enabledCustom, disabledCustom, "feature gates cannot be both enabled and disabled in customNoUpgrade"}, + {enabledSpecial, disabledSpecial, "feature gates cannot be both enabled and disabled in specialHandlingSupportExceptionRequired"}, + {enabledCustom, disabledSpecial, "feature gates cannot be enabled in customNoUpgrade and disabled in specialHandlingSupportExceptionRequired"}, + {disabledCustom, enabledSpecial, "feature gates cannot be disabled in customNoUpgrade and enabled in specialHandlingSupportExceptionRequired"}, } for _, check := range conflictChecks { From dd5a1c6ad0743fdc5537621e87581ae1bc126b77 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 6 Mar 2026 04:28:23 +0000 Subject: [PATCH 6/8] update component images --- packaging/crio.conf.d/10-microshift_amd64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 6ead732c27..5c72433399 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-v4.0-art-dev@sha256:03a68878becdf9f19ea8dba9d20d9b14e505e568194f6345a0bf8e64a445203e" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:acb68a6933a56ff97b5ae13cd611cede0143fd59e4821c8d6adcca2098023056" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 47d46f55c22eee180f1308592bb93da377166aab Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 6 Mar 2026 04:28:27 +0000 Subject: [PATCH 7/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 | 6 +++--- assets/release/release-x86_64.json | 18 +++++++++--------- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index 6c9a71a7ef..722c26c6a4 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-v4.0-art-dev - digest: sha256:709d3f3d6e6a49fabacefd96ed468ad973ae0f5da1f1b61b5140bea099e7a725 + digest: sha256:29238ab465cb0f5796cf44271bbfee9b33f06db286c00110dc9e65097a878b9f - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:fef5e57ea4cbccaf400b4df0c2429f1b6ba00707acb593b6c58e719cb19c5132 + digest: sha256:6fe248247385085b35dfc68c0d427325062785c884ac956711b08417ade062e5 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index 72b75f4784..3cd2a84bd4 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.22.0-0.nightly-arm64-2026-03-05-024021" + "base": "4.22.0-0.nightly-arm64-2026-03-06-030256" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:067b86d045349126085a17e0d067719a8050fe99f968d49f28cb8d677641f4bc", diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 3845f0fc92..b332e161d1 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": "4.22.0-0.nightly-2026-03-02-153725" + "base": "4.22.0-0.nightly-2026-03-05-070435" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:709d3f3d6e6a49fabacefd96ed468ad973ae0f5da1f1b61b5140bea099e7a725", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fef5e57ea4cbccaf400b4df0c2429f1b6ba00707acb593b6c58e719cb19c5132" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:29238ab465cb0f5796cf44271bbfee9b33f06db286c00110dc9e65097a878b9f", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fe248247385085b35dfc68c0d427325062785c884ac956711b08417ade062e5" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 9c2fe4ca48..39082957e5 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-v4.0-art-dev - digest: sha256:6ae79da6531bf3b60092e0d20de14251bf11530c0339c6c2b616f79584867f26 + digest: sha256:8f1610403468c8a26c104177a18275c14bdfe82f9f075a81b899edd5d2e0d91d - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:c29ea5cb6e084b49b115f1c26c7967090d009e39e68f905841c95415abc40007 + digest: sha256:3a64fb2be9f64229ad14b6fa028d57c7782724adb06b4a9b282a9591630d282e - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:957bb71c53f9f45a46cd471fe6ece04fe0adf65a489a5cf36c20d7941cb3bfe6 + digest: sha256:d0c76b89772bac508b693aabe733e57c6c401d6fe58411b2384ff84b2e53d2d0 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-v4.0-art-dev@sha256:c29ea5cb6e084b49b115f1c26c7967090d009e39e68f905841c95415abc40007 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a64fb2be9f64229ad14b6fa028d57c7782724adb06b4a9b282a9591630d282e - 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:6ae79da6531bf3b60092e0d20de14251bf11530c0339c6c2b616f79584867f26 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f1610403468c8a26c104177a18275c14bdfe82f9f075a81b899edd5d2e0d91d 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 35b4591294..f0e34e0310 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": "4.22.0-0.nightly-arm64-2026-03-05-024021" + "base": "4.22.0-0.nightly-arm64-2026-03-06-030256" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:274bc2a82a869641e4f9a659faa5c42a442032968905330fc0a08a15d4b92a02", 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 653bd7869a..04f04328a8 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": "4.22.0-0.nightly-2026-03-02-153725" + "base": "4.22.0-0.nightly-2026-03-05-070435" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ae79da6531bf3b60092e0d20de14251bf11530c0339c6c2b616f79584867f26", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c29ea5cb6e084b49b115f1c26c7967090d009e39e68f905841c95415abc40007", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:957bb71c53f9f45a46cd471fe6ece04fe0adf65a489a5cf36c20d7941cb3bfe6" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f1610403468c8a26c104177a18275c14bdfe82f9f075a81b899edd5d2e0d91d", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a64fb2be9f64229ad14b6fa028d57c7782724adb06b4a9b282a9591630d282e", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0c76b89772bac508b693aabe733e57c6c401d6fe58411b2384ff84b2e53d2d0" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 46e37128a1..4d36e62f9c 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,13 +1,13 @@ { "release": { - "base": "4.22.0-0.nightly-arm64-2026-03-05-024021" + "base": "4.22.0-0.nightly-arm64-2026-03-06-030256" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:449d216388a8a0a7b0dbe806e1fd29c6585160bdb46a147e9eb31fb3b29ad877", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9fc96a3d358b814aa5048e1bc73ad8e63eeab680e5c3aab739ebe10d0b93520", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b84634605e4bd062dbe81a3a9fff3bcb174740ba5fa4d520515c1e0a12d8f01c", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5043a834f264505fee0c0288abca18674cefbbb40ec0961fb19c73ed71b6f145", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c11fbc6f32b7cff7d11d63dda6c4b785c3425f1c80521312801975b5e4032bac", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2ae854ce7b05e77b90c17388cb6f8a667aea653e665c17748033a81d2a927a6", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d39bd6be404474ecbad5026ae7ebffabadce61fc751b4bc751205a346a7dbf4", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9a144aa54b3ea4cbf410f8f73bff7a3dccf0cd1ad34def12aac956e0df18b40", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:edf4758055c34352ee56691cd37392dc86b6a48350bbef396c3092a0f922a416", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index d6fce0397f..4d839e64fc 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.22.0-0.nightly-2026-03-02-153725" + "base": "4.22.0-0.nightly-2026-03-05-070435" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d600215f1d3c3edf54f73df338eb83a591e93dde1ae71259e79938a411289d82", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0f51efef00cea2f5454676bdb1482242df6d4408ee945daaecfbf318d16fdb3", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec2ff966be587330cca9fa4c902c839145ffbb8450b1696f0b39e54bc5f491e6", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:957bb71c53f9f45a46cd471fe6ece04fe0adf65a489a5cf36c20d7941cb3bfe6", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20d9e421fae5fd366a66811b9619185a48760df6144983796a1661fc2966515f", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03a68878becdf9f19ea8dba9d20d9b14e505e568194f6345a0bf8e64a445203e", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03eb33da41f46489f667be895479b155e8e51be44aa60d9313aa13bd238be0d5", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e6df35b0ec72c2edf626ce7635780673c14e298bc7add2e43df295dce413825b", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81838f93e999144edecbc646e9106583809104e6f1a54137054552bc82aa1518", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ed0855bd67a9ed63c581755272f61fc1e15276a8eb6db67d5438ed74dcec02b", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0c76b89772bac508b693aabe733e57c6c401d6fe58411b2384ff84b2e53d2d0", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:53e440411d63269cef975183d03dd38fbee33c2aad2b0f99daf369f8bfd45351", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:acb68a6933a56ff97b5ae13cd611cede0143fd59e4821c8d6adcca2098023056", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:94e2a598fc3f5a60b763e19861e64a818266869c2cb62e2c1acae2847eb7450b", "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:1cbdacd9960820b43a589963b1bcc45a9c7114985b960bac8a2006113f3ba98a" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2999ae872e0674d64b2eb5c7ceffa20eb3480eec50df9de2add78fb977218aee" } } From 9b9db16655e683bbf9cf017bf33685026a4b6572 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 6 Mar 2026 04:28:37 +0000 Subject: [PATCH 8/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 18c2c231a8..c18aa407ae 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.22.0-0.nightly-arm64-2026-03-05-024021 +OCP_VERSION := 4.22.0-0.nightly-arm64-2026-03-06-030256 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 7c2b520ad6..ec894383a9 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.22.0-0.nightly-2026-03-02-153725 +OCP_VERSION := 4.22.0-0.nightly-2026-03-05-070435