NO-ISSUE: rebase-release-5.0-5.0.0-0.nightly-2026-05-29-194233_amd64-2026-05-29_arm64-2026-06-01

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 5.0.0-0.nightly-arm64-2026-05-27-222818
+OCP_VERSION := 5.0.0-0.nightly-arm64-2026-06-01-004903

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 5.0.0-0.nightly-2026-05-27-205543
+OCP_VERSION := 5.0.0-0.nightly-2026-05-29-194233

assets/components/multus/release-multus-aarch64.json

@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-arm64-2026-05-27-222818"
+    "base": "5.0.0-0.nightly-arm64-2026-06-01-004903"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9731df837f9dc3677bf2676d9a739eb12f76a38b1870a00792cd70e5dff9f03b",

assets/components/multus/release-multus-x86_64.json

@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-2026-05-27-205543"
+    "base": "5.0.0-0.nightly-2026-05-29-194233"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0d60eed5435b727796d71713f0e4edae2f8cf009e0c5af2c42747a1b100dfd33",

assets/components/openshift-dns/dns/daemonset.yaml

@@ -57,15 +57,8 @@ spec:
             failureThreshold: 5
           resources:
             requests:
-              {{- range $key, $value := .DNSRequests }}
-              {{ $key }}: {{ $value }}
-              {{- end }}
-            {{- if .DNSLimits }}
-            limits:
-              {{- range $key, $value := .DNSLimits }}
-              {{ $key }}: {{ $value }}
-              {{- end }}
-            {{- end }}
+              cpu: 50m
+              memory: 70Mi
           securityContext:
             readOnlyRootFilesystem: true
           image: '{{ .ReleaseImage.coredns }}'

assets/crd/route.crd.yaml

@@ -558,13 +558,13 @@ spec:
                 - termination
                 type: object
                 x-kubernetes-validations:
+                - message: cannot have both spec.tls.certificate and spec.tls.externalCertificate
+                  rule: '!(has(self.certificate) && has(self.externalCertificate))'
                 - message: 'cannot have both spec.tls.termination: passthrough and
                     spec.tls.insecureEdgeTerminationPolicy: Allow'
                   rule: 'has(self.termination) && has(self.insecureEdgeTerminationPolicy)
                     ? !((self.termination==''passthrough'') && (self.insecureEdgeTerminationPolicy==''Allow''))
                     : true'
-                - message: cannot have both spec.tls.certificate and spec.tls.externalCertificate
-                  rule: '!(has(self.certificate) && has(self.externalCertificate))'
               to:
                 description: |-
                   to is an object the route should use as the primary backend. Only the Service kind

assets/optional/operator-lifecycle-manager/release-olm-aarch64.json

@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-arm64-2026-05-27-222818"
+    "base": "5.0.0-0.nightly-arm64-2026-06-01-004903"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:62283e52d11c75defea93afdf86f8d50e8028155bde588b4d43298f7204c4188",

assets/optional/operator-lifecycle-manager/release-olm-x86_64.json

@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-2026-05-27-205543"
+    "base": "5.0.0-0.nightly-2026-05-29-194233"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:7f415763ee0a7c205f5e6f11b4fa5aff0aaa0eda109288aaf8d123f6dba59d3b",

assets/release/release-aarch64.json

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-arm64-2026-05-27-222818"
+    "base": "5.0.0-0.nightly-arm64-2026-06-01-004903"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b09be655df91261f96df64a17c9af8754238f9de772e06c1af14fc2f7e8a2918",
+    "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d9aaba23e019b9e1cda47878d986ab83dfe1de73fb269de3cd0759871650ecb5",
     "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:477b23e4acc6f370f1083ed2ff9d29800475b67d604aba5ef9dbcdede647d528",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8ce94c719d49cdc98b56a4595bbbff75721381e0e2432b4d93faa1e54793b2be",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0053edf86c2a802a62a07af974324ad4f1aa37c5f85164255321d8bf676820fc",

assets/release/release-x86_64.json

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-2026-05-27-205543"
+    "base": "5.0.0-0.nightly-2026-05-29-194233"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:5834bc2fe2f60d6ddcd1e52c3f3d6f542213cd97c06c4fe9a98de979fde6f772",
+    "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:4e9af2ebf315aa2e29f587a0721eefe7a438a7a2933324c3a84115ca96cc92d3",
     "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:521fdf9daae2a5e9427b1f337d6f7d574e1e07cba0fbedc5dcdecc200944b240",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0f5e8e002ada1f7adc0116b8393fdeacabfcc418924134a7f49fa55b4b298117",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:021ef755badbca515d58b612e314b021ef2f50312811c9721b1f4c5f2c6b8529",

scripts/auto-rebase/changelog.txt

@@ -1,57 +1,19 @@
-- csi-external-snapshotter embedded-component 3219da7dcbb14fa762704746d21fb38131beb1f4 to 77d02e52a442c1a98457797bf8eb5777489aabae
-  - 6316ddd 2026-05-25T12:29:32+01:00 UPSTREAM: <drop>: vendor changes
-  - 84b0745 2026-05-25T12:29:20+01:00 UPSTREAM: 1403: Bump google.golang.org/grpc to v1.79.3
-
-- kubernetes embedded-component 73359c58edaa0a838b8557b8743ad5860a955272 to 99b75aa92a7f60c4446ee29f54d511f140a8aed0
-  - 0c487fdcc 2026-05-20T17:48:11-03:00 UPSTREAM: <drop>: bump library-go
-  - 91e515568 2026-05-20T16:21:31-03:00 UPSTREAM: <carry>: remove RouteExternalCertificate feature gate
-
-- machine-config-operator embedded-component f9bc3c89294762591088e83762f7bda188243729 to 78e9e0e35b20d538b5b27c2fbb061612d5675d1f
-  - 8ad800fe 2026-05-25T14:49:35Z OCPBUGS-86474: Tests using realtime kernel should not be limited to aws and gcp platforms
-  - 70e8d896 2026-05-25T09:28:09Z OCPBUGS-86332: remove tests using base images older than 4.13
-  - 3d844adf 2026-05-21T16:47:04-04:00 fix iri test
-  - e8bd3e07 2026-05-20T08:25:12-04:00 fix iri deletion test
-  - 286bd6c0 2026-05-19T20:19:48-04:00 additional unit tests/e2e test, simplified watcher methods
-  - b1d4753e 2026-05-19T13:48:42-04:00 add acceptance tests and skill
-  - 354b9a5d 2026-05-19T13:48:42-04:00 Use CA certificate for TLS validation in registry ping
-  - 00c5a2c2 2026-05-19T13:48:40-04:00 AGENT-1488: Aggregate IRI status from MachineConfigNodes
-  - 433e6c8f 2026-05-18T14:11:47Z MCO-2288: Adapt test '54922 - daemon: add check before updating kernelArgs'. Use --delete-if-present
-  - 27197e06 2026-05-05T05:16:35-04:00 reclaim disk space from the node when IRI resource is deleted
-  - 80f0f0d4 2026-03-03T10:58:50-05:00 unify GOTAGS behavior and remove unneded build tags
-
-- operator-framework-olm embedded-component 328957caa46b4d822ff39dc823bc5e28f7f2bf80 to bc60033b299368309e8d3ca001cba75970c227c9
-  - 462501c5 2026-05-27T00:03:01Z fix: bypass system registries.conf in image-canonical-ref tool (#3839)
-  - b8100d2c 2026-05-26T14:02:57Z Bump go.podman.io/common from 0.67.1 to 0.68.0 (#1996)
-  - 97b5a649 2026-05-26T14:02:18Z Bump golang.org/x/sys from 0.44.0 to 0.45.0 in the golang-x-deps group (#1995)
-  - 3f8d5aba 2026-05-26T14:02:03Z Store custom schema metas as proto binary in pogreb cache (#1994)
-  - ab5cb366 2026-05-26T14:01:48Z Add ExperimentalListPackageCustomSchemas streaming gRPC endpoint (#1981)
-  - 22cfa0f7 2026-05-26T14:01:34Z Bump go.podman.io/image/v5 from 5.39.2 to 5.40.0 (#1991)
-  - 7f3df3d9 2026-05-26T14:01:19Z Bump github.com/containerd/containerd from 1.7.31 to 1.7.32 (#1993)
-  - dcd2f9c0 2026-05-26T14:01:05Z Bump github.com/docker/cli (#1992)
-  - cf6a1c58 2026-05-26T14:00:50Z fix(validate): validate skipRange with blang/semver ParseRange (#1987)
-  - ef26e896 2026-05-26T14:00:35Z Bump github.com/docker/cli (#1990)
-  - f830b8e3 2026-05-26T14:00:20Z Bump github.com/onsi/ginkgo/v2 from 2.28.3 to 2.29.0 (#1989)
-  - 02b8f26f 2026-05-26T14:00:06Z Bump github.com/onsi/gomega from 1.40.0 to 1.41.0 (#1988)
-  - 02a9fdba 2026-05-26T13:59:51Z Bump google.golang.org/grpc from 1.81.0 to 1.81.1 (#1985)
-  - 92849157 2026-05-26T13:59:36Z Bump github.com/docker/cli (#1984)
-  - 404922d6 2026-05-26T13:59:21Z Bump github.com/grpc-ecosystem/grpc-health-probe from 0.4.49 to 0.4.50 (#1982)
-  - 67f67108 2026-05-26T13:59:04Z chore(dep): bump operator-registry to v1.69.0 (#3838)
-  - 10c3e662 2026-05-26T13:58:47Z :seedling: Bump go.podman.io/image/v5 from 5.39.2 to 5.40.0 (#3837)
-  - 975f6974 2026-05-26T13:58:30Z :seedling: Bump golang.org/x/net from 0.54.0 to 0.55.0 (#3836)
-  - 92264f8e 2026-05-26T13:58:12Z :seedling: Bump github.com/containerd/containerd from 1.7.31 to 1.7.32 (#3835)
-
-- route-controller-manager embedded-component 6a87600a4c82f2a822a2f88ab81b968bac858205 to 1916ceb059f500f06e8552f88bf38cd09f9522fd
-  - 0bc1316 2026-05-19T16:32:54Z OCPBUGS-39598: remove all duplicate ingress IPs in clearPersistedAllocation
-
-- csi-external-snapshotter image-amd64 3219da7dcbb14fa762704746d21fb38131beb1f4 to 77d02e52a442c1a98457797bf8eb5777489aabae
-  - 6316ddd 2026-05-25T12:29:32+01:00 UPSTREAM: <drop>: vendor changes
-  - 84b0745 2026-05-25T12:29:20+01:00 UPSTREAM: 1403: Bump google.golang.org/grpc to v1.79.3
-
-- kubernetes image-amd64 73359c58edaa0a838b8557b8743ad5860a955272 to 99b75aa92a7f60c4446ee29f54d511f140a8aed0
-  - 0c487fdcc 2026-05-20T17:48:11-03:00 UPSTREAM: <drop>: bump library-go
-  - 91e515568 2026-05-20T16:21:31-03:00 UPSTREAM: <carry>: remove RouteExternalCertificate feature gate
-
-- kubernetes image-arm64 73359c58edaa0a838b8557b8743ad5860a955272 to 99b75aa92a7f60c4446ee29f54d511f140a8aed0
-  - 0c487fdcc 2026-05-20T17:48:11-03:00 UPSTREAM: <drop>: bump library-go
-  - 91e515568 2026-05-20T16:21:31-03:00 UPSTREAM: <carry>: remove RouteExternalCertificate feature gate
+- api embedded-component 09730f85d8835712c0412a585685ddadb01e171b to 9f553042f9aeef56dd86d5251053b7eeb174a9f8
+  - ae470e8a 2026-05-27T17:18:37+02:00 Revert "Merge pull request #2693 from jcmoraisjr/OCPBUGS-74511-remove-featuregate"
+  - b2c31788 2026-05-21T08:51:16-04:00 feat: configv1/authentication: add fields for sourcing claims from external sources
+  - 0ed3b012 2026-05-20T16:04:48+02:00 Add new fields to ThanosQuerierConfig
+
+- cluster-kube-apiserver-operator embedded-component 3f0fc12dd47751683491e66b7da4c3afafe83ba2 to b9a9d00800fc64540a9b989fa9bd774fc29a927e
+  - f8de9aa 2026-05-27T16:25:52-04:00 kms: use DefaultFakeVaultEncryptionProvider to ensure AppRole secret setup
+  - 2a7a874 2026-05-27T20:03:30+02:00 render: fall back to Authentication CR
+  - d2f42de 2026-05-27T11:48:17-04:00 bump(openshift/library-go): fitting
+  - 4ba8ba0 2026-05-27T11:33:15-04:00 bump(openshift/library-go): to get KMS plugin lifecycle changes
+  - ab50385 2026-05-27T11:31:11-04:00 kms: support deploying Vault mock plugin
+
+- cluster-network-operator embedded-component bea98c0a2a0ff2cc7c642f72feefddbf42f5e28f to 01100f5dd1940a496a3aae3140747bd6bc4da5da
+  - c2241d4 2026-05-15T15:25:37+02:00 DROP: detect --enable-interconnect support at runtime
+  - 09b660b 2026-05-15T15:25:37+02:00 Remove --enable-interconnect flag from OVN-K manifests
+
+- oc image-arm64 a052bd4018333201e48f7370b2263db2dc6a5c99 to 9557cf3d482ecbc4e271eb4eefeefff5eaf4bdac
+  - b3d656c3 2026-05-26T13:10:41-07:00 Switch container dependencies to Podman monorepo
 

scripts/auto-rebase/commits.txt

@@ -1,11 +1,11 @@
-https://github.com/openshift/api embedded-component 09730f85d8835712c0412a585685ddadb01e171b
+https://github.com/openshift/api embedded-component 9f553042f9aeef56dd86d5251053b7eeb174a9f8
 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 8360b3561fd7fd9abcd67064d3604f6f57f3c3b0
-https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 3f0fc12dd47751683491e66b7da4c3afafe83ba2
+https://github.com/openshift/cluster-kube-apiserver-operator embedded-component b9a9d00800fc64540a9b989fa9bd774fc29a927e
 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component ca150c42a7982509b8bba34080308cff00c09310
 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component d43423b583269eea8236040424609c3f108ac9c4
-https://github.com/openshift/cluster-network-operator embedded-component bea98c0a2a0ff2cc7c642f72feefddbf42f5e28f
+https://github.com/openshift/cluster-network-operator embedded-component 01100f5dd1940a496a3aae3140747bd6bc4da5da
 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
@@ -25,7 +25,7 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 d12e274605248f6c5937324
 https://github.com/openshift/ovn-kubernetes image-amd64 3ce6353a1ed2962dc8aabe96dcef0e5bd7a40555
 https://github.com/openshift/kubernetes image-amd64 99b75aa92a7f60c4446ee29f54d511f140a8aed0
 https://github.com/openshift/service-ca-operator image-amd64 e7ccfa308e69ce4ad1f2afcd1d7c8ff25144374b
-https://github.com/openshift/oc image-arm64 a052bd4018333201e48f7370b2263db2dc6a5c99
+https://github.com/openshift/oc image-arm64 9557cf3d482ecbc4e271eb4eefeefff5eaf4bdac
 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 676113436feb61e5c89376d6a7ae66fdaefe8e98

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-05-27-205543" "registry.ci.openshift.org/ocp-arm64/release-5-arm64:5.0.0-0.nightly-arm64-2026-05-27-222818"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release-5:5.0.0-0.nightly-2026-05-29-194233" "registry.ci.openshift.org/ocp-arm64/release-5-arm64:5.0.0-0.nightly-arm64-2026-06-01-004903"