From c812afa96cbef4fa3adecda9048b8f4c221ffa2a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 27 Apr 2026 04:16:20 +0000 Subject: [PATCH 1/7] 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 fda58145a1..d0e9e485e4 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-04-21-130601" "registry.ci.openshift.org/ocp-arm64/release-5-arm64:5.0.0-0.nightly-arm64-2026-04-23-082815" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release-5:5.0.0-0.nightly-2026-04-26-064718" "registry.ci.openshift.org/ocp-arm64/release-5-arm64:5.0.0-0.nightly-arm64-2026-04-26-061912" From bc9d214f1b08528b33bde3b8dc64ab87dce6117c Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 27 Apr 2026 04:16:21 +0000 Subject: [PATCH 2/7] update changelog --- scripts/auto-rebase/changelog.txt | 66 +++++++++++++++++++++++++++++++ scripts/auto-rebase/commits.txt | 30 +++++++------- 2 files changed, 81 insertions(+), 15 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..0a222448c9 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,66 @@ +- api embedded-component 34e60874783e455a38f466e1d0c572bbb3d17c51 to 4f63a40a2970d8bcc2f3767bc6b57e09880544fb + - b6544bf1 2026-04-21T11:16:04Z Remove UserNamespacesPodSecurityStandards and UserNamespacesSupport feature gates + +- cluster-ingress-operator embedded-component f40071e60c14be1ee12772a260c08adaadaf3e94 to 961ac218364fb5f6de970ade1161ece3b8195aed + - 2cdc405 2026-04-03T10:00:19-04:00 Fix race condition in internal-to-external LB migration test + - 28f66b0 2026-03-31T16:06:00-04:00 NE-2390: Add system context and strategic orientation to AGENTS.md + - 76aebbe 2026-03-02T13:02:31Z NE-2390: Address review comments on AGENTS.md + - 0e2bf51 2026-01-15T13:13:39Z NE-2390: Adding AGENTS.md file to + +- cluster-network-operator embedded-component bdbba59d992a4b2846591ac5260ea12fd14481e0 to 142432afacfb9cd11a9bd4e5e333bd6a4cdcd555 + - 18ef2d9 2026-03-30T08:53:55+02:00 Allowlist controller: fix error handling in config map existence check + - f3abaf7 2026-03-30T08:53:55+02:00 Allowlist controller: inline single-use helper functions + - 01a4fc1 2026-03-30T08:53:55+02:00 Allowlist controller: remove unused scheme field + - 8682b2e 2026-03-30T08:53:55+02:00 Allowlist controller: remove unused configmap template + - 8f4d3bb 2026-03-30T08:53:55+02:00 Allowlist controller: refactor names in controller code + +- cluster-openshift-controller-manager-operator embedded-component e1c3674198c6c1274fd3fd3c3108eb4cade4eb0a to c941a99dd2b9200c0de23606c4372d33d656a756 + - 2221135 2026-04-17T12:50:54-04:00 Add control-plane-approvers to OWNERS + +- kubernetes embedded-component 354a124256da76c98d191bf53149eb4578fee0d7 to 757ccdfcf9a1f89059acaba311c3625c495a6732 + - 6cb4b77d1 2026-04-10T17:24:36+02:00 UPSTREAM: 138318: DRA: use full image name in test manifests + - 6bdaf8d14 2026-04-09T17:48:14+02:00 UPSTREAM: 136337: DRA E2E: use image utils to manage hostpath image + - 7158cad4a 2026-04-09T17:38:44+02:00 UPSTREAM: 136913: Update the csi-driver-host-path version to 1.17.1 + +- machine-config-operator embedded-component c3a9db7663f116037e10ed526e35f1c20e5a6f3b to b5d168576877cda02f8c8764b49a98fda23df825 + - fd094b02 2026-04-23T14:29:45+02:00 OCPBUGS-84218: Fix units rollback if update failure + - 7aeb7b85 2026-04-22T10:46:35-04:00 add RootCA cert to the sysContextBuilder certs + - 006070e7 2026-04-13T10:15:44-04:00 improve JSON unmarshalling for secret decoding + +- operator-framework-olm embedded-component e627823c743797da91b4ae8a318d2420a511b752 to 122728c856e9436ea5ab763bf57977047691bb90 + - f31d8dec 2026-04-15T00:05:09Z Bump softprops/action-gh-release from 2 to 3 (#3815) + - fe2ab6f6 2026-04-15T00:04:22Z :seedling: Bump golang.org/x/net from 0.52.0 to 0.53.0 (#3814) + - 1001b6a7 2026-04-15T00:04:02Z remove stale owners (#3813) + - 24ea4fb7 2026-04-15T00:03:44Z :seedling: Bump go.opentelemetry.io/otel/sdk from 1.40.0 to 1.43.0 (#3811) + +- service-ca-operator embedded-component 7b3033bba87d7b40684b66f8f44a3525433d1ac7 to 95674f775bcff10cfec79a61a0e3451e4c48eb71 + - 63ecf71 2026-03-03T10:22:22+01:00 controller/servingcerts: Align log verbosity + +- oc image-amd64 30bb6e56a38d49b6d646a260be79b072dc27dab1 to 6b8e30c5b39aa742147846341a203905e04834f3 + - ad1b93fb 2026-04-21T22:31:23+05:30 Add support for groups via YAML/JSON + +- ovn-kubernetes image-amd64 90d101f8b4ebae811d1a0ea195d98a5a85ffaef1 to aaa4085f32001c72a7f02557aae8ded035deb341 + - 85383e01 2026-04-21T15:44:44-07:00 OTE: tolerate missing OpenShift CRDs on MicroShift + - 5ae54ebf 2026-04-13T14:11:22+02:00 OTE: Wait for default sa to be provisioned in test namespace + - bf97aec4 2026-04-13T14:11:22+02:00 OTE: Add FeatureGate:EVPN label for EVPN E2Es + - f2653a31 2026-04-13T14:11:22+02:00 OTE: Extract external container networking to dedicated provider + - 924d6e3b 2026-04-13T14:11:22+02:00 OTE: Enable EVPN E2Es + - 73db83b9 2026-04-13T14:11:22+02:00 OTE: Add external container support to infra provider + +- kubernetes image-amd64 354a124256da76c98d191bf53149eb4578fee0d7 to 757ccdfcf9a1f89059acaba311c3625c495a6732 + - 6cb4b77d1 2026-04-10T17:24:36+02:00 UPSTREAM: 138318: DRA: use full image name in test manifests + - 6bdaf8d14 2026-04-09T17:48:14+02:00 UPSTREAM: 136337: DRA E2E: use image utils to manage hostpath image + - 7158cad4a 2026-04-09T17:38:44+02:00 UPSTREAM: 136913: Update the csi-driver-host-path version to 1.17.1 + +- service-ca-operator image-amd64 7b3033bba87d7b40684b66f8f44a3525433d1ac7 to 95674f775bcff10cfec79a61a0e3451e4c48eb71 + - 63ecf71 2026-03-03T10:22:22+01:00 controller/servingcerts: Align log verbosity + +- oc image-arm64 30bb6e56a38d49b6d646a260be79b072dc27dab1 to 6b8e30c5b39aa742147846341a203905e04834f3 + - ad1b93fb 2026-04-21T22:31:23+05:30 Add support for groups via YAML/JSON + +- ovn-kubernetes image-arm64 ad4056529c72b7c0cebdffa9b49ff04a7828748e to aaa4085f32001c72a7f02557aae8ded035deb341 + - 85383e01 2026-04-21T15:44:44-07:00 OTE: tolerate missing OpenShift CRDs on MicroShift + +- service-ca-operator image-arm64 7b3033bba87d7b40684b66f8f44a3525433d1ac7 to 95674f775bcff10cfec79a61a0e3451e4c48eb71 + - 63ecf71 2026-03-03T10:22:22+01:00 controller/servingcerts: Align log verbosity + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 48827f047d..51c5e1a6f3 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,35 +1,35 @@ -https://github.com/openshift/api embedded-component 34e60874783e455a38f466e1d0c572bbb3d17c51 +https://github.com/openshift/api embedded-component 4f63a40a2970d8bcc2f3767bc6b57e09880544fb https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 108f37f0e378accc322cbeb68136ec500ec35b94 https://github.com/openshift/cluster-dns-operator embedded-component 3d2141182243cde1ec6417bd005c76d29aa88a01 -https://github.com/openshift/cluster-ingress-operator embedded-component f40071e60c14be1ee12772a260c08adaadaf3e94 +https://github.com/openshift/cluster-ingress-operator embedded-component 961ac218364fb5f6de970ade1161ece3b8195aed https://github.com/openshift/cluster-kube-apiserver-operator embedded-component df4cff15fcd9cb3eb6643dc52309f5b93230b3ce https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component f66ec606970c59461a174d789a5cccbe231c9b32 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component a0495853f80d38e19d07b98a225e1aa0e7972ac9 -https://github.com/openshift/cluster-network-operator embedded-component bdbba59d992a4b2846591ac5260ea12fd14481e0 -https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component e1c3674198c6c1274fd3fd3c3108eb4cade4eb0a +https://github.com/openshift/cluster-network-operator embedded-component 142432afacfb9cd11a9bd4e5e333bd6a4cdcd555 +https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component c941a99dd2b9200c0de23606c4372d33d656a756 https://github.com/openshift/cluster-policy-controller embedded-component bb429f5b2a7d77791110b06d8ec5c017183e3ab9 https://github.com/openshift/csi-external-snapshotter embedded-component d1bc3ffaa9759c13a06c2ec61c541342e71bd109 https://github.com/openshift/etcd embedded-component d8d67b8ce849f816d6d23c904098336632e2348f -https://github.com/openshift/kubernetes embedded-component 354a124256da76c98d191bf53149eb4578fee0d7 +https://github.com/openshift/kubernetes embedded-component 757ccdfcf9a1f89059acaba311c3625c495a6732 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 72835e43c7754356645e41031f3a99926b4d42e6 -https://github.com/openshift/machine-config-operator embedded-component c3a9db7663f116037e10ed526e35f1c20e5a6f3b +https://github.com/openshift/machine-config-operator embedded-component b5d168576877cda02f8c8764b49a98fda23df825 https://github.com/openshift/openshift-controller-manager embedded-component 26d20feae8892f648f5b06ed3f5492fe6ffb4532 -https://github.com/openshift/operator-framework-olm embedded-component e627823c743797da91b4ae8a318d2420a511b752 +https://github.com/openshift/operator-framework-olm embedded-component 122728c856e9436ea5ab763bf57977047691bb90 https://github.com/openshift/route-controller-manager embedded-component 624742d93f3a7885cf7f70985f1e23ff60da580d -https://github.com/openshift/service-ca-operator embedded-component 7b3033bba87d7b40684b66f8f44a3525433d1ac7 -https://github.com/openshift/oc image-amd64 30bb6e56a38d49b6d646a260be79b072dc27dab1 +https://github.com/openshift/service-ca-operator embedded-component 95674f775bcff10cfec79a61a0e3451e4c48eb71 +https://github.com/openshift/oc image-amd64 6b8e30c5b39aa742147846341a203905e04834f3 https://github.com/openshift/coredns image-amd64 0dded2d232dab43c107b1dab9d0d9fdfd8259622 https://github.com/openshift/csi-external-snapshotter image-amd64 d1bc3ffaa9759c13a06c2ec61c541342e71bd109 https://github.com/openshift/router image-amd64 896390778ebe15f57f87e6ca78f11c96e64c2652 https://github.com/openshift/kube-rbac-proxy image-amd64 d12e274605248f6c59373240a7eae7a7a357dcb3 -https://github.com/openshift/ovn-kubernetes image-amd64 90d101f8b4ebae811d1a0ea195d98a5a85ffaef1 -https://github.com/openshift/kubernetes image-amd64 354a124256da76c98d191bf53149eb4578fee0d7 -https://github.com/openshift/service-ca-operator image-amd64 7b3033bba87d7b40684b66f8f44a3525433d1ac7 -https://github.com/openshift/oc image-arm64 30bb6e56a38d49b6d646a260be79b072dc27dab1 +https://github.com/openshift/ovn-kubernetes image-amd64 aaa4085f32001c72a7f02557aae8ded035deb341 +https://github.com/openshift/kubernetes image-amd64 757ccdfcf9a1f89059acaba311c3625c495a6732 +https://github.com/openshift/service-ca-operator image-amd64 95674f775bcff10cfec79a61a0e3451e4c48eb71 +https://github.com/openshift/oc image-arm64 6b8e30c5b39aa742147846341a203905e04834f3 https://github.com/openshift/coredns image-arm64 0dded2d232dab43c107b1dab9d0d9fdfd8259622 https://github.com/openshift/csi-external-snapshotter image-arm64 d1bc3ffaa9759c13a06c2ec61c541342e71bd109 https://github.com/openshift/router image-arm64 896390778ebe15f57f87e6ca78f11c96e64c2652 https://github.com/openshift/kube-rbac-proxy image-arm64 d12e274605248f6c59373240a7eae7a7a357dcb3 -https://github.com/openshift/ovn-kubernetes image-arm64 ad4056529c72b7c0cebdffa9b49ff04a7828748e +https://github.com/openshift/ovn-kubernetes image-arm64 aaa4085f32001c72a7f02557aae8ded035deb341 https://github.com/openshift/kubernetes image-arm64 757ccdfcf9a1f89059acaba311c3625c495a6732 -https://github.com/openshift/service-ca-operator image-arm64 7b3033bba87d7b40684b66f8f44a3525433d1ac7 +https://github.com/openshift/service-ca-operator image-arm64 95674f775bcff10cfec79a61a0e3451e4c48eb71 From 6e27f5a5da04049dedd17e17f2731fbee2f19317 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 27 Apr 2026 04:18:00 +0000 Subject: [PATCH 3/7] update microshift/deps --- .../kubernetes/test/e2e/dra/utils/deploy.go | 46 ++++++++++++++++--- .../dra/dra-test-driver-proxy.yaml | 2 +- .../csi-hostpath-plugin.yaml | 2 +- .../hostpath/csi-hostpath-plugin.yaml | 2 +- .../storage-csi/mock/csi-mock-driver.yaml | 2 +- .../storage-csi/mock/csi-mock-proxy.yaml | 2 +- 6 files changed, 44 insertions(+), 12 deletions(-) diff --git a/deps/github.com/openshift/kubernetes/test/e2e/dra/utils/deploy.go b/deps/github.com/openshift/kubernetes/test/e2e/dra/utils/deploy.go index 589048c0a8..7c7214db50 100644 --- a/deps/github.com/openshift/kubernetes/test/e2e/dra/utils/deploy.go +++ b/deps/github.com/openshift/kubernetes/test/e2e/dra/utils/deploy.go @@ -75,6 +75,7 @@ import ( e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" "k8s.io/kubernetes/test/e2e/storage/drivers/proxy" "k8s.io/kubernetes/test/e2e/storage/utils" + "k8s.io/kubernetes/test/utils/image" "k8s.io/utils/clock" "k8s.io/utils/ptr" "sigs.k8s.io/yaml" @@ -451,12 +452,6 @@ func (d *Driver) SetUp(nodes *Nodes, driverResources map[string]resourceslice.Dr } } - manifests := []string{ - // The code below matches the content of this manifest (ports, - // container names, etc.). - "test/e2e/testing-manifests/dra/dra-test-driver-proxy.yaml", - } - // Create service account and corresponding RBAC rules. d.serviceAccountName = "dra-kubelet-plugin-" + d.Name + d.InstanceSuffix + "-service-account" content := example.PluginPermissions @@ -464,16 +459,52 @@ func (d *Driver) SetUp(nodes *Nodes, driverResources map[string]resourceslice.Dr content = strings.ReplaceAll(content, "dra-kubelet-plugin", "dra-kubelet-plugin-"+d.Name+d.InstanceSuffix) d.createFromYAML(ctx, []byte(content), d.f.Namespace.Name) + // Figure out which hostpathplugin to use: basically the latest one + // from the test/e2e/testing-manifests/storage-csi manifests. That is + // where SIG Storage maintains the versions of the hostpath image which + // are part of Kubernetes E2E testing. test/utils/image parses those files. + // + // We piggy-back on that instead of controlling the version ourselves + // because it reduces effort, at the risk of unexpected + // breakage. Another benefit is that -list-images and registry patching + // via test/utils/image + KUBE_TEST_REPO_LIST work. + hostPathImage := "registry.k8s.io/sig-storage/hostpathplugin" + hostPathVersion := "" + for _, config := range image.GetOriginalImageConfigs() { + parts := strings.SplitN(config.GetE2EImage(), ":", 2) + if len(parts) < 2 { + continue + } + image, version := parts[0], parts[1] + if image != hostPathImage { + continue + } + // "Dumb" string comparison is good enough for e.g. v1.16.1 < v1.17.0. + // It seems unlikely that any major/patch will need more than one digit + // or that version grow beyond 99. + if hostPathVersion == "" || hostPathVersion < version { + hostPathVersion = version + } + } + origImageURL := hostPathImage + ":" + hostPathVersion + patchedImageURL, err := image.ReplaceRegistryInImageURL(origImageURL) + framework.ExpectNoError(err, "look up E2E image") + // Using a ReplicaSet instead of a DaemonSet has the advantage that we can control // the lifecycle explicitly, in particular run two pods per node long enough to // run checks. + manifests := []string{ + // The code below matches the content of this manifest (ports, + // container names, etc.). + "test/e2e/testing-manifests/dra/dra-test-driver-proxy.yaml", + } instanceKey := "app.kubernetes.io/instance" rsName := "" numNodes := int32(len(nodes.NodeNames)) pluginDataDirectoryPath := path.Join(framework.TestContext.KubeletRootDir, "plugins", d.Name) registrarDirectoryPath := path.Join(framework.TestContext.KubeletRootDir, "plugins_registry") instanceName := d.Name + d.InstanceSuffix - err := utils.CreateFromManifests(ctx, d.f, d.f.Namespace, func(item interface{}) error { + err = utils.CreateFromManifests(ctx, d.f, d.f.Namespace, func(item interface{}) error { switch item := item.(type) { case *appsv1.ReplicaSet: item.Name += d.NameSuffix + d.InstanceSuffix @@ -481,6 +512,7 @@ func (d *Driver) SetUp(nodes *Nodes, driverResources map[string]resourceslice.Dr item.Spec.Replicas = &numNodes item.Spec.Selector.MatchLabels[instanceKey] = instanceName item.Spec.Template.Labels[instanceKey] = instanceName + item.Spec.Template.Spec.Containers[0].Image = patchedImageURL item.Spec.Template.Spec.ServiceAccountName = d.serviceAccountName item.Spec.Template.Spec.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[0].LabelSelector.MatchLabels[instanceKey] = instanceName item.Spec.Template.Spec.Affinity.NodeAffinity = &v1.NodeAffinity{ diff --git a/deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/dra/dra-test-driver-proxy.yaml b/deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/dra/dra-test-driver-proxy.yaml index 6c7da12638..f01aca4a9f 100644 --- a/deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/dra/dra-test-driver-proxy.yaml +++ b/deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/dra/dra-test-driver-proxy.yaml @@ -47,7 +47,7 @@ spec: containers: - name: pause - image: registry.k8s.io/sig-storage/hostpathplugin:v1.16.1 + image: registry.k8s.io/sig-storage/hostpathplugin:to-be-replaced # Version and actual registry get patched in during deployment. command: - /bin/sh - -c diff --git a/deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/storage-csi/external-snapshotter/volume-group-snapshots/csi-hostpath-plugin.yaml b/deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/storage-csi/external-snapshotter/volume-group-snapshots/csi-hostpath-plugin.yaml index 9f79eb4da3..155e368d7e 100644 --- a/deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/storage-csi/external-snapshotter/volume-group-snapshots/csi-hostpath-plugin.yaml +++ b/deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/storage-csi/external-snapshotter/volume-group-snapshots/csi-hostpath-plugin.yaml @@ -219,7 +219,7 @@ spec: serviceAccountName: csi-hostpathplugin-sa containers: - name: hostpath - image: registry.k8s.io/sig-storage/hostpathplugin:v1.16.1 + image: registry.k8s.io/sig-storage/hostpathplugin:v1.17.1 args: - "--drivername=hostpath.csi.k8s.io" - "--v=5" diff --git a/deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml b/deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml index 080fe5cb01..ff3a78dd14 100644 --- a/deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml +++ b/deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml @@ -237,7 +237,7 @@ spec: serviceAccountName: csi-hostpathplugin-sa containers: - name: hostpath - image: registry.k8s.io/sig-storage/hostpathplugin:v1.17.0 + image: registry.k8s.io/sig-storage/hostpathplugin:v1.17.1 args: - "--drivername=hostpath.csi.k8s.io" - "--v=5" diff --git a/deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml b/deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml index fbac7b5fb3..f998860ecb 100644 --- a/deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml +++ b/deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml @@ -53,7 +53,7 @@ spec: - mountPath: /registration name: registration-dir - name: mock - image: registry.k8s.io/sig-storage/hostpathplugin:v1.17.0 + image: registry.k8s.io/sig-storage/hostpathplugin:v1.17.1 args: - "--drivername=mock.storage.k8s.io" - "--nodeid=$(KUBE_NODE_NAME)" diff --git a/deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/storage-csi/mock/csi-mock-proxy.yaml b/deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/storage-csi/mock/csi-mock-proxy.yaml index 0530c9a472..0b8dd30a18 100644 --- a/deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/storage-csi/mock/csi-mock-proxy.yaml +++ b/deps/github.com/openshift/kubernetes/test/e2e/testing-manifests/storage-csi/mock/csi-mock-proxy.yaml @@ -53,7 +53,7 @@ spec: - mountPath: /registration name: registration-dir - name: mock - image: registry.k8s.io/sig-storage/hostpathplugin:v1.17.0 + image: registry.k8s.io/sig-storage/hostpathplugin:v1.17.1 args: - -v=5 - -nodeid=$(KUBE_NODE_NAME) From dee1b69fd4ec372e1319b128ef3d550d89be21c8 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 27 Apr 2026 04:18:25 +0000 Subject: [PATCH 4/7] 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 155b0f5411..5a035a2e9b 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:7b23a09a3b70ff2f56547ce70ae4f47158758c393d3200e9b9b78ad070145bf2" +pause_image = "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:088275e7747673d89ea45429f8d360c2e9ddc056107cd92e64377ea7ad3c62c0" 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 f776cb3d8c..366e37ae70 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:83108707cd14cdae145c255d84371cb7d0437e183dc6a43133ca785239948291" +pause_image = "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:38547ae2d0f8c57fbb5f2513434725013f738a9bd59850e593ec60ce7c07b3f9" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From df6b02cd2a8538a68e9e6a8e40b950d8aa5a1f2e Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 27 Apr 2026 04:18:27 +0000 Subject: [PATCH 5/7] update manifests --- .../multus/kustomization.aarch64.yaml | 4 ++-- .../multus/kustomization.x86_64.yaml | 4 ++-- .../multus/release-multus-aarch64.json | 6 +++--- .../multus/release-multus-x86_64.json | 6 +++--- .../kustomization.aarch64.yaml | 10 +++++----- .../kustomization.x86_64.yaml | 10 +++++----- .../release-olm-aarch64.json | 8 ++++---- .../release-olm-x86_64.json | 8 ++++---- assets/release/release-aarch64.json | 18 +++++++++--------- assets/release/release-x86_64.json | 18 +++++++++--------- 10 files changed, 46 insertions(+), 46 deletions(-) diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index 09596c76af..c8569d3350 100644 --- a/assets/components/multus/kustomization.aarch64.yaml +++ b/assets/components/multus/kustomization.aarch64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:90c894ac917474b769ce3cb76375ab42b7968b023aff63b54da30a24875d9a27 + digest: sha256:0ff82fc01ef11f9c8c967b068a153081a4b19165eaa15fbb7f6f26e722f57bb9 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:a17a7d9a3c1f81457e41ff8780c0d0cc7833fae538546b927623a3687014e7ae + digest: sha256:6c85c16c63d0c4a0aa3b9d1ddbf07a4fed224ee680fab72167d80039d9d1db6d diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index 6ca4e5cdbb..a7c2efbd1f 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:2ae14f7c28b08879fa5eaac54b0633763aa520b1050ce12b7f9a9b20e7320fee + digest: sha256:4a17e2f198c051b22b7bde9f9598a0571b1f9ba2b0647a53d9148114caedc3bc - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:c47c93fc9cd493faad1e90fdb8b3ffb8d63c1823b8ee9db769a690b074675454 + digest: sha256:0deefd19802c33a9c95d95d85480e14f67dc8517fa0c35b0f61de931d4b6217f diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index a03d3b29da..c3976bcb11 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "5.0.0-0.nightly-arm64-2026-04-23-082815" + "base": "5.0.0-0.nightly-arm64-2026-04-26-061912" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:90c894ac917474b769ce3cb76375ab42b7968b023aff63b54da30a24875d9a27", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a17a7d9a3c1f81457e41ff8780c0d0cc7833fae538546b927623a3687014e7ae" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0ff82fc01ef11f9c8c967b068a153081a4b19165eaa15fbb7f6f26e722f57bb9", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6c85c16c63d0c4a0aa3b9d1ddbf07a4fed224ee680fab72167d80039d9d1db6d" } } diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index a91316dd90..7533403394 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-04-21-130601" + "base": "5.0.0-0.nightly-2026-04-26-064718" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:2ae14f7c28b08879fa5eaac54b0633763aa520b1050ce12b7f9a9b20e7320fee", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c47c93fc9cd493faad1e90fdb8b3ffb8d63c1823b8ee9db769a690b074675454" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:4a17e2f198c051b22b7bde9f9598a0571b1f9ba2b0647a53d9148114caedc3bc", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0deefd19802c33a9c95d95d85480e14f67dc8517fa0c35b0f61de931d4b6217f" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 4ae0687408..f9ce86d6b1 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.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:00179da0a7a493f6615b680684eb8f5d134098517d2d6b60920d75e249cfc012 + digest: sha256:b96dd6dc0b0c403ba36dd7166ea5c0e8ac874b6bd482c91853dafda62471bcf3 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:77329201b8d84bf7b960f6f75128393af37745950673cda8e887f16279d477bf + digest: sha256:dd783995e5f3ed48d50f06be68ed27c76271f65c896003a17a65355636828a40 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:e02bdb1876a065d865fdf87aef70e9ed0d793fd529b22e810b226de09c4f9d6b + digest: sha256:188e0afb591fde5922b2a3df21597a7f42a4e1e1f3b4e1e68f66b9691be5a6da 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:77329201b8d84bf7b960f6f75128393af37745950673cda8e887f16279d477bf + value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:dd783995e5f3ed48d50f06be68ed27c76271f65c896003a17a65355636828a40 - 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:00179da0a7a493f6615b680684eb8f5d134098517d2d6b60920d75e249cfc012 + value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b96dd6dc0b0c403ba36dd7166ea5c0e8ac874b6bd482c91853dafda62471bcf3 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 257190d2b5..12687853eb 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:016073edd8a5ab5e32adf8dc4b83ddc8793fb2acd1fe06916b9c0ab6eebf9f66 + digest: sha256:043bf8e359196085290e24ae47f897f1befa89b336ca5a89dad843044ec74b39 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:103b079fb52ae76b17097d84ef18c36f4a56ac508da4050be78587c5a0ef8909 + digest: sha256:fc1c3b770c61569f1377211fc150df061796335efac1d75e456258d319fc271d - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev - digest: sha256:6b5b450a53fc73478a134aecd2490b4f0709a9678bd2d81186b853f588a67c62 + digest: sha256:63f598debd51e32a3af22d3830d903ebcd78a8887265c09f04c71e2ad7470b3d 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:103b079fb52ae76b17097d84ef18c36f4a56ac508da4050be78587c5a0ef8909 + value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:fc1c3b770c61569f1377211fc150df061796335efac1d75e456258d319fc271d - 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:016073edd8a5ab5e32adf8dc4b83ddc8793fb2acd1fe06916b9c0ab6eebf9f66 + value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:043bf8e359196085290e24ae47f897f1befa89b336ca5a89dad843044ec74b39 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 851d877891..b25b7b97c9 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "5.0.0-0.nightly-arm64-2026-04-23-082815" + "base": "5.0.0-0.nightly-arm64-2026-04-26-061912" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:00179da0a7a493f6615b680684eb8f5d134098517d2d6b60920d75e249cfc012", - "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:77329201b8d84bf7b960f6f75128393af37745950673cda8e887f16279d477bf", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e02bdb1876a065d865fdf87aef70e9ed0d793fd529b22e810b226de09c4f9d6b" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b96dd6dc0b0c403ba36dd7166ea5c0e8ac874b6bd482c91853dafda62471bcf3", + "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:dd783995e5f3ed48d50f06be68ed27c76271f65c896003a17a65355636828a40", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:188e0afb591fde5922b2a3df21597a7f42a4e1e1f3b4e1e68f66b9691be5a6da" } } 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 b8f9a1b32f..c77a943995 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-04-21-130601" + "base": "5.0.0-0.nightly-2026-04-26-064718" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:016073edd8a5ab5e32adf8dc4b83ddc8793fb2acd1fe06916b9c0ab6eebf9f66", - "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:103b079fb52ae76b17097d84ef18c36f4a56ac508da4050be78587c5a0ef8909", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6b5b450a53fc73478a134aecd2490b4f0709a9678bd2d81186b853f588a67c62" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:043bf8e359196085290e24ae47f897f1befa89b336ca5a89dad843044ec74b39", + "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:fc1c3b770c61569f1377211fc150df061796335efac1d75e456258d319fc271d", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:63f598debd51e32a3af22d3830d903ebcd78a8887265c09f04c71e2ad7470b3d" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 54110c4897..854061e0bb 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-04-23-082815" + "base": "5.0.0-0.nightly-arm64-2026-04-26-061912" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0220ed3dd109e72a721a6ef66a694d6d755b3ee61db98f6ac4bcf8b4f8a0ea5f", - "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:48de8f04244f2339e9b5150f81d46f9080aec145246fbbfd20c89da8802c5e3e", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1ce1b4e22b0fec4545f011e394ad07a4db6ecf67a652e1899bf409d2040ab907", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e02bdb1876a065d865fdf87aef70e9ed0d793fd529b22e810b226de09c4f9d6b", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d6ed1f28c38245087b3049754194cd597223cda6f553069599538be7540ca7b0", - "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:83108707cd14cdae145c255d84371cb7d0437e183dc6a43133ca785239948291", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:169e0488e871ff975d39c4bf959cfe14cce913ffe35ddf2986f904606dcd577a", + "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b45003e3d4165bc1be8d60a0d3e1dcf8ba09f43e899a37644bc9b2a5ffe31465", + "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:ce6323527616cf848ecffc431bbd356c94e99a8a4d0d8b6133fdbf962e7654d6", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:17552ef39754cf1b53c4c96dd107d1a0f59213a695bfff31d5a21acf941fa84a", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:188e0afb591fde5922b2a3df21597a7f42a4e1e1f3b4e1e68f66b9691be5a6da", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d9a45a6d73117cc3dbc49d6525ab2002f9fba659d59bd81491654f766af70ef0", + "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:38547ae2d0f8c57fbb5f2513434725013f738a9bd59850e593ec60ce7c07b3f9", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:20f72cb0464291673aad8cfee875a822514b307d2326b70f2bf3caa8ccd3048a", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9fb7758558394d92954be3f124864a5e623175b58c1a00fb1c1330834304068b" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0948fefd33dca6abef683a5280b79e0766c11ffccd9780e66de363d774331196" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 0296acbb1e..007cf8d57d 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-04-21-130601" + "base": "5.0.0-0.nightly-2026-04-26-064718" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:43db4c2fad88732b37b8c851fe5d193b683a1a653c2099af8e3c9e3a28f5798e", - "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6b13ddd3bc829f67f56ceb62c43a2787512012e0abe6aaa05fb905254f7e7f47", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:ec5429411f479e519c40865175ab66f736b5a94495558603fa5b3d12ed785eff", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6b5b450a53fc73478a134aecd2490b4f0709a9678bd2d81186b853f588a67c62", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a13f5afc3dd0f80e9abe15f8bc86197acf243f4bd1ca602ac6a107842e550ff8", - "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:7b23a09a3b70ff2f56547ce70ae4f47158758c393d3200e9b9b78ad070145bf2", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:27822d45b23589968ae5db89640ee3303e94527d80ebcd5c03ade8efce4d6b68", + "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c0a99e7ce0c77a177a080c98aaec65cb82ae271ea4361af95d482c35146941e0", + "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:16945dcf0fcb6fd973d86d652ce07508664b6f05f97d93815bc23a9428113167", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9e0561ec6ce2c97f052462a35a6db4c9c9fe46353303dbd25e571e81e7002bbc", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:63f598debd51e32a3af22d3830d903ebcd78a8887265c09f04c71e2ad7470b3d", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1312092b993a8e7fe8571fdd075041cb00bf51084740b2230ac499ee7b09d3eb", + "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:088275e7747673d89ea45429f8d360c2e9ddc056107cd92e64377ea7ad3c62c0", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:ebaa67c44356ad9b899f04b675772d0f59c4b78e141257816522f2ecf591808b", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:dd06fe1deea877cddb398502c43e6ec98aab3ff807026e2036c44d8d364f035a" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c0db5cd9a538815edcb434e47977ec131cd8057c7626185e5cd595a6c20566e8" } } From d2f14530f0ae19e7319084148f306c4709b8cafb Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 27 Apr 2026 04:18:30 +0000 Subject: [PATCH 6/7] update buildfiles --- Makefile.kube_git.var | 2 +- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 3f0766379a..872ca8959b 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=35 KUBE_GIT_VERSION=v1.35.3 -KUBE_GIT_COMMIT=354a124256da76c98d191bf53149eb4578fee0d7 +KUBE_GIT_COMMIT=757ccdfcf9a1f89059acaba311c3625c495a6732 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index eb73a6ba61..b70986594e 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 5.0.0-0.nightly-arm64-2026-04-23-082815 +OCP_VERSION := 5.0.0-0.nightly-arm64-2026-04-26-061912 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 2116804390..50f5eedb3b 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 5.0.0-0.nightly-2026-04-21-130601 +OCP_VERSION := 5.0.0-0.nightly-2026-04-26-064718 From f7d4bd15b61c5def84ba11469b094adb909a3b46 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 27 Apr 2026 04:18:51 +0000 Subject: [PATCH 7/7] 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 6b35ccab45..fddd860d40 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.5" + "base": "2.25.6" }, "images": { "ray-tls-generator-image": "registry.redhat.io/ubi9/ubi-minimal:latest",