NO-ISSUE: rebase-5.0.0 0-nightly-2026-07-23-224236-amd64-2026-07-23-arm64-2026-07-23

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=a466682e3867da746be24d7d56c6641612721d6c
+KUBE_GIT_MINOR=36
+KUBE_GIT_VERSION=v1.36.2
+KUBE_GIT_COMMIT=98b35193b2ac7a23a673325f5e9b830ecd5ba406
 KUBE_GIT_TREE_STATE=clean

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 5.0.0-0.nightly-arm64-2026-07-17-001244
+OCP_VERSION := 5.0.0-0.nightly-arm64-2026-07-23-184356

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 5.0.0-0.nightly-2026-07-15-220514
+OCP_VERSION := 5.0.0-0.nightly-2026-07-23-224236

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:3cf363d309471a8acdc831cdaa26724b37bb5c87e2655da352e8b35071bc89f6
+    digest: sha256:c934655e8242c9a2458e7f4ffccae803640333e50fa45d5734b59fbf6841c0b5
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:4ce8f81ffb304e1c72501b05bb662161ba05e247c9dc39a8ac38fafe64ffdf49
+    digest: sha256:0735751fd9d7500144adc7d03277a908611fafa2b2d893e115c4937c911c8a4c

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:65007fc14fd342b1886ded0863bb33b9d996bccde009130c63ee4becd3b36e76
+    digest: sha256:29f31422d6d637e350f99a58001ef8929cb151497ccc4d4f128d3b408812f635
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:12555a96af5099d693fb5a848b2ac667541efed1264ec8d9089cef703daf7fd7
+    digest: sha256:c63df61df4155fb06d9da879bb7d0e96b5e34161e1ad78e43e87d0690fcae29a

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-arm64-2026-07-17-001244"
+    "base": "5.0.0-0.nightly-arm64-2026-07-23-184356"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3cf363d309471a8acdc831cdaa26724b37bb5c87e2655da352e8b35071bc89f6",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:4ce8f81ffb304e1c72501b05bb662161ba05e247c9dc39a8ac38fafe64ffdf49"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c934655e8242c9a2458e7f4ffccae803640333e50fa45d5734b59fbf6841c0b5",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0735751fd9d7500144adc7d03277a908611fafa2b2d893e115c4937c911c8a4c"
   }
 }

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-2026-07-15-220514"
+    "base": "5.0.0-0.nightly-2026-07-23-224236"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:65007fc14fd342b1886ded0863bb33b9d996bccde009130c63ee4becd3b36e76",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:12555a96af5099d693fb5a848b2ac667541efed1264ec8d9089cef703daf7fd7"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:29f31422d6d637e350f99a58001ef8929cb151497ccc4d4f128d3b408812f635",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c63df61df4155fb06d9da879bb7d0e96b5e34161e1ad78e43e87d0690fcae29a"
   }
 }

assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml

@@ -2,26 +2,26 @@
 images:
   - name: quay.io/operator-framework/olm
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:1a52144ac0eac1c19a10f785a203bf2239b0d27e4f38f3df376b21455faadfc2
+    digest: sha256:a56df7c2b9e9e52efbdd7f2dcc5975a56e637ba119a851d032d6a32bc99e7555
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:2f998144ef0ccbf2238f3378626ccaad8c40db9a9b5e00be25030d5da55fc60e
+    digest: sha256:478da303ed01c69953777b033c5f1cb2dde0c3da627077fd6029ad9b4f54c074
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:df9112ca14f1bbb587b587177c303b394d0d495aa1750ae3f4e51545976ee8b9
+    digest: sha256:b2d88ae979f7c3494736c077389154221881f0d8c61f352917325fb49ee5fdee
 
 patches:
   - patch: |-
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OPERATOR_REGISTRY_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:2f998144ef0ccbf2238f3378626ccaad8c40db9a9b5e00be25030d5da55fc60e
+         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:478da303ed01c69953777b033c5f1cb2dde0c3da627077fd6029ad9b4f54c074
      - 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:1a52144ac0eac1c19a10f785a203bf2239b0d27e4f38f3df376b21455faadfc2
+         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a56df7c2b9e9e52efbdd7f2dcc5975a56e637ba119a851d032d6a32bc99e7555
     target:
       kind: Deployment
       labelSelector: app=catalog-operator

assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml

@@ -2,26 +2,26 @@
 images:
   - name: quay.io/operator-framework/olm
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:ef092697ec904e89e24a83b497b3128b3d8e8465f06bace9720de8df1e326896
+    digest: sha256:18957bcdaaa13c8c028b3742805b66d30d82fab2273dbeb71938844c44c5d5c5
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:1137ab0e37a6cee5b2bebf59e848df062e003b80b7c5ea11ff5375bb7d995a2e
+    digest: sha256:714be6db62abadfce860b3ace30d35e63e087d9bf07ac3e667578d91e8659fcd
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:7ded20b8edab8e5ff785537f6a8df0c86846a9ddffd0e3aac4d1938af7b66ba8
+    digest: sha256:849ba7d8ef4add8ef5841c14276f97cf9920b33bebf26ee021d72f08064e7abb
 
 patches:
   - patch: |-
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OPERATOR_REGISTRY_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1137ab0e37a6cee5b2bebf59e848df062e003b80b7c5ea11ff5375bb7d995a2e
+         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:714be6db62abadfce860b3ace30d35e63e087d9bf07ac3e667578d91e8659fcd
      - 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:ef092697ec904e89e24a83b497b3128b3d8e8465f06bace9720de8df1e326896
+         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:18957bcdaaa13c8c028b3742805b66d30d82fab2273dbeb71938844c44c5d5c5
     target:
       kind: Deployment
       labelSelector: app=catalog-operator

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-arm64-2026-07-17-001244"
+    "base": "5.0.0-0.nightly-arm64-2026-07-23-184356"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1a52144ac0eac1c19a10f785a203bf2239b0d27e4f38f3df376b21455faadfc2",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:2f998144ef0ccbf2238f3378626ccaad8c40db9a9b5e00be25030d5da55fc60e",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:df9112ca14f1bbb587b587177c303b394d0d495aa1750ae3f4e51545976ee8b9"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a56df7c2b9e9e52efbdd7f2dcc5975a56e637ba119a851d032d6a32bc99e7555",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:478da303ed01c69953777b033c5f1cb2dde0c3da627077fd6029ad9b4f54c074",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b2d88ae979f7c3494736c077389154221881f0d8c61f352917325fb49ee5fdee"
   }
 }

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-2026-07-15-220514"
+    "base": "5.0.0-0.nightly-2026-07-23-224236"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:ef092697ec904e89e24a83b497b3128b3d8e8465f06bace9720de8df1e326896",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1137ab0e37a6cee5b2bebf59e848df062e003b80b7c5ea11ff5375bb7d995a2e",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:7ded20b8edab8e5ff785537f6a8df0c86846a9ddffd0e3aac4d1938af7b66ba8"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:18957bcdaaa13c8c028b3742805b66d30d82fab2273dbeb71938844c44c5d5c5",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:714be6db62abadfce860b3ace30d35e63e087d9bf07ac3e667578d91e8659fcd",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:849ba7d8ef4add8ef5841c14276f97cf9920b33bebf26ee021d72f08064e7abb"
   }
 }

assets/release/release-aarch64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-arm64-2026-07-17-001244"
+    "base": "5.0.0-0.nightly-arm64-2026-07-23-184356"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:812b53e15796acd3ad2a61ae7eb2ddca3d8ff50e7acc00abb9fdeed19d39d83f",
-    "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:542ccfa4478285db446b5620de530317d4038026aaf93233bca9a07a86047e85",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b9c308626c908fd1318d0c99ea1e2e902115bbcecce3974931e1616e6544d14c",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:df9112ca14f1bbb587b587177c303b394d0d495aa1750ae3f4e51545976ee8b9",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:2e4d763a146782bf55b0896b43ff84545b02ec47c7fd135995ac2ec09ab42253",
-    "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:162bcfbb6f6d0bbe9a6d32e736f7450bf8b1df9da222ddd2fb74dd82da246464",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:7c98dc5f64b4ef82abdc1be61ced52cdd30355c43875f981f06e5f74feca07b6",
+    "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:61b2ee6377414084e9aacd776208f0d5b6165d21f22375b676403eb7a063941b",
+    "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f25acc6172c94b10740af1d301812f291e774b8e614d0549bc2aabac2f98e645",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a7665f3859052f6830d538b9c5f452bd2d2dbd4459f0a7ca0d9b35bbd7c518cf",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b2d88ae979f7c3494736c077389154221881f0d8c61f352917325fb49ee5fdee",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:925684bf793acc7fdfe619b42effcf539d7e7241ca382a06ffbe731220e7c20a",
+    "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1fb5051063872f062cc5fd14f3cbb22f8129e9077ae0eabcae7f2ead13dc10fc",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f782c5cde71f34419fc9d16242d9ac15840ad4368050bb6fe987a5c06b43222c",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:e77365e44676fbd8ab9e4ce53f3a406856bbdfef3467c545a7df1197d84477af",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e6789c15f6842d73a43ddb0cb6bf6fdd95f9325fbd59ea496c90dbba7a323032"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:078e4ba093f8c929861155ce3ec815763c9a119fd0502e483299a00d94f8f5e8"
   }
 }

assets/release/release-x86_64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-2026-07-15-220514"
+    "base": "5.0.0-0.nightly-2026-07-23-224236"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:7725c8310d859f4f754e6e4dc72db02acc16ac839092d525872c4ec05967f860",
-    "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:40ea0e4d402053385124b84dcc999478964236bf3217f7fe3493b45c24a95d35",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:58287286e340f4723fe070c84f01a90d5dd4613118421a5f5879a5af51283c96",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:7ded20b8edab8e5ff785537f6a8df0c86846a9ddffd0e3aac4d1938af7b66ba8",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0be8b9c3791fed7940affdcbdd69a74d7f77ef6fbebfbc483e83e238dcb1ea2b",
-    "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:25023872d791d17030f60056223279676a4112eb6f315cf30db5f918ca6c4109",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d40e5664479d1b7dd5cebca75787d7e1452410cc88b326c08aedc42367a6422b",
+    "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:45188944bb589e9b3fd88bd175a18b9414a2ba070e2a08a3964e22ceedaf2955",
+    "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f8333c52e3b4ec5d1575a31276b9600f173ddda7d6f1a0cb11f0d364fe5be29a",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9d40caf7c3a21b802c6632cf968b8c17f5bb756b6ff0564b77ee2dc9898e38f3",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:849ba7d8ef4add8ef5841c14276f97cf9920b33bebf26ee021d72f08064e7abb",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e05f31e81de47bfb323c9015b117bf2dcf34abb56d7effcd43513378ef45aae6",
+    "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:046dee0e64bb32cdb9d34b43abc4c1b8f2d1700e2243e3812b759e1436677c9b",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:dcdfe8696ab6c9c7098e3ea2d297af47b68e91eac931364e13e46edd28b2a479",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:10c9ccab4f2857d113b55e12cac29aed0dc97d5a4e29ed2e4ea0f77551ee55f8",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b202d57d1e9a54ff29c19f89cc6494c7e2b534c913cd427d266858ce14255103"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f0631a7e1e3aa1cf6ac01df7a7b0b8ce5f5ad333e2efc8f4599b4428a6d54c22"
   }
 }

deps/github.com/openshift/kubernetes/.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.25-openshift-4.22
+  tag: rhel-9-release-golang-1.26-openshift-5.0

deps/github.com/openshift/kubernetes/.github/PULL_REQUEST_TEMPLATE.md

@@ -13,6 +13,7 @@ https://git.k8s.io/community/contributors/devel/sig-release/release.md#issuepr-k
 <!--
 Add one of the following kinds:
 /kind bug
+/kind dependency
 /kind cleanup
 /kind documentation
 /kind feature

deps/github.com/openshift/kubernetes/.gitignore

@@ -107,6 +107,11 @@ network_closure.sh
 # direnv .envrc files
 .envrc
 
+# Local agent override file
+AGENTS.override.md
+# TODO: remove once there is a merged AGENTS.md
+AGENTS.md
+
 # Downloaded kubernetes binary release tar ball
 kubernetes.tar.gz
 

deps/github.com/openshift/kubernetes/.go-version

@@ -1 +1 @@
-1.25.7
+1.26.4