diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 0a74ebc34c..2c2bf678f3 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.21.0-0.nightly-arm64-2026-07-30-012031 +OCP_VERSION := 4.21.0-0.nightly-arm64-2026-08-10-005412 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 7b489e278e..8ad6a429ea 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.21.0-0.nightly-2026-07-29-083019 +OCP_VERSION := 4.21.0-0.nightly-2026-08-07-125427 diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index f0e8a8d0d8..2ae460363a 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-v4.0-art-dev - digest: sha256:9c46922a21bd0ae743c76fff223c20df39de421c453c1e18ae0fed6c6af76452 + digest: sha256:d5c22b45a840420ce13f4ff6a826fc5826959b0b461ce46721f321b3936f9c60 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:7c9e3b6703d1f1186011b90ad4840d4acafde845b7ce05bd3f184991e45ac887 + digest: sha256:4103ff28647a22160d31898398b5d08d68a29b938b8c390376487c3143f6c3fa diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index 72728813c3..0fe2e529ab 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:bfe2cdedca07243457a8a4509849aed7d17ad3f8a6042ba6ba93f516660a23a9 + digest: sha256:a891ea4f905e2b4772bee0c4df161cbd6a4ca056d89a5e11d46430e3a5ea4b41 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:0d61ff9dce2accadf131c7c4408828673fa18456cd1f7380a123538346359c89 + digest: sha256:5c44fa5b2bb622b8c8b928c13015b816e28dfae25a8f3d544852f9d41fd71987 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index 5d54a23629..fe8c1c8088 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.21.0-0.nightly-arm64-2026-07-30-012031" + "base": "4.21.0-0.nightly-arm64-2026-08-10-005412" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c46922a21bd0ae743c76fff223c20df39de421c453c1e18ae0fed6c6af76452", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c9e3b6703d1f1186011b90ad4840d4acafde845b7ce05bd3f184991e45ac887" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d5c22b45a840420ce13f4ff6a826fc5826959b0b461ce46721f321b3936f9c60", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4103ff28647a22160d31898398b5d08d68a29b938b8c390376487c3143f6c3fa" } } diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 74be590b6e..2c472eccfc 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.21.0-0.nightly-2026-07-29-083019" + "base": "4.21.0-0.nightly-2026-08-07-125427" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bfe2cdedca07243457a8a4509849aed7d17ad3f8a6042ba6ba93f516660a23a9", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d61ff9dce2accadf131c7c4408828673fa18456cd1f7380a123538346359c89" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a891ea4f905e2b4772bee0c4df161cbd6a4ca056d89a5e11d46430e3a5ea4b41", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5c44fa5b2bb622b8c8b928c13015b816e28dfae25a8f3d544852f9d41fd71987" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 9ef393bd6f..ac71399ba9 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-v4.0-art-dev - digest: sha256:6ca864715ebe6b3ff6531722f9f887b35b42cb37d4f07efa8927a811cc65bc19 + digest: sha256:d64f1b0788eb9fd391fa0cd33f8b78623d431a7fea306212e4fc27b2eaf0813d - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:60d0dba79cf093b7f45c46ce1e97097d9fd6d46ef0f2f90b56d0ac55d96263b5 + digest: sha256:057f533a2aa43006a2769528397af9897fddf715a8aded6e3bb7c4c9a8a5f4bb - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:c20434325db1d2bd2644973e58966f8d8ca3793afd8df875a96a60e381571bb6 + digest: sha256:1688b4666ca90f0651c4bc4a5933e9e189ef979f8b8f657ad86729e94fcdbab9 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:60d0dba79cf093b7f45c46ce1e97097d9fd6d46ef0f2f90b56d0ac55d96263b5 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:057f533a2aa43006a2769528397af9897fddf715a8aded6e3bb7c4c9a8a5f4bb - 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:6ca864715ebe6b3ff6531722f9f887b35b42cb37d4f07efa8927a811cc65bc19 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d64f1b0788eb9fd391fa0cd33f8b78623d431a7fea306212e4fc27b2eaf0813d 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 6dc77bfdfb..04e0254560 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:5a8549d4353edd06da204ebc1c7e43327c1c24bb82164c7f6e338c667c08add7 + digest: sha256:16bbb6e0d2f945eebb64c608e6f18a6347a614ae6aa4ebccf7ab6b498e8c0851 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:75ad22915bb294701a4a85685785ab0d776a532296fab1e7a3ce3a9c5d0c9002 + digest: sha256:63549f72c2f83f60d3a35fd2ad737d6351c0f0683ad33828737d6262c9dc5f84 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:147ac00be29b9429bcad4164df488d1e5767c59c69af11b4fd9d61812dbf50b7 + digest: sha256:6ec27fe0bd8ad9cffc44454171da53d18a330a3778d0c8d79403f440915205d2 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:75ad22915bb294701a4a85685785ab0d776a532296fab1e7a3ce3a9c5d0c9002 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:63549f72c2f83f60d3a35fd2ad737d6351c0f0683ad33828737d6262c9dc5f84 - 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:5a8549d4353edd06da204ebc1c7e43327c1c24bb82164c7f6e338c667c08add7 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:16bbb6e0d2f945eebb64c608e6f18a6347a614ae6aa4ebccf7ab6b498e8c0851 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 0ecb0121c7..97a9be138f 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": "4.21.0-0.nightly-arm64-2026-07-30-012031" + "base": "4.21.0-0.nightly-arm64-2026-08-10-005412" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ca864715ebe6b3ff6531722f9f887b35b42cb37d4f07efa8927a811cc65bc19", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:60d0dba79cf093b7f45c46ce1e97097d9fd6d46ef0f2f90b56d0ac55d96263b5", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c20434325db1d2bd2644973e58966f8d8ca3793afd8df875a96a60e381571bb6" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d64f1b0788eb9fd391fa0cd33f8b78623d431a7fea306212e4fc27b2eaf0813d", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:057f533a2aa43006a2769528397af9897fddf715a8aded6e3bb7c4c9a8a5f4bb", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1688b4666ca90f0651c4bc4a5933e9e189ef979f8b8f657ad86729e94fcdbab9" } } 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 7cae45d16f..91ac4fe2a4 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.21.0-0.nightly-2026-07-29-083019" + "base": "4.21.0-0.nightly-2026-08-07-125427" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a8549d4353edd06da204ebc1c7e43327c1c24bb82164c7f6e338c667c08add7", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75ad22915bb294701a4a85685785ab0d776a532296fab1e7a3ce3a9c5d0c9002", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:147ac00be29b9429bcad4164df488d1e5767c59c69af11b4fd9d61812dbf50b7" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:16bbb6e0d2f945eebb64c608e6f18a6347a614ae6aa4ebccf7ab6b498e8c0851", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:63549f72c2f83f60d3a35fd2ad737d6351c0f0683ad33828737d6262c9dc5f84", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ec27fe0bd8ad9cffc44454171da53d18a330a3778d0c8d79403f440915205d2" } } diff --git a/assets/optional/sriov/kustomization.aarch64.yaml b/assets/optional/sriov/kustomization.aarch64.yaml index 209c7239fd..17f99d56c1 100644 --- a/assets/optional/sriov/kustomization.aarch64.yaml +++ b/assets/optional/sriov/kustomization.aarch64.yaml @@ -1,7 +1,7 @@ images: - name: quay.io/openshift/sriov-network-operator newName: registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator - digest: sha256:cf022b3d699c7f2988efa0ab32722c951bad164f1ef5e13adfc062fb46b47c1d + digest: sha256:d78dd37a7dcbf23f11a5bc2da194eddaaf169ac35c1ac9057d8b46c2662c4ff3 patches: - patch: |- @@ -9,47 +9,47 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: SRIOV_CNI_IMAGE - value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:a2042c240acaac54b214a3ea4e436c92c72c16111f093279048cb27ef38a1cd6 + value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:de745411f2dcc1ecfb2a5014b281677987a70563895cd8c0808733ea756fe997 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_DEVICE_PLUGIN_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:0bb0c9b01fa23dd1a3ba6334fd8dc418a62992bdae7579c28002947d200eac6f + value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:9ec8140328ab98c3f78bf94557abe44fd863469cff58dc5d49c64efea48ffd3c - op: add path: /spec/template/spec/containers/0/env/- value: name: NETWORK_RESOURCES_INJECTOR_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:540b6bf2abd31ec83d431b602c2e12e0f99ed4ab36fff776baf3417d26a40fc1 + value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:4ecee4770f2a1be0032a001db1008e81b985656cfd4b1e410362888564da7416 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_NETWORK_CONFIG_DAEMON_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:89b210aee5cdabe41dfd25f04107a56cd145c36c3ad67f7ee900e3b01bf2c944 + value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:6f9e48ae07d12017d61726c2947e633fb5eab7c201efbb2fed658171a131c6c6 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_NETWORK_WEBHOOK_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:6db37040285eab4deaeb550f3d597d0962513244021f70241e38776db16d9e09 + value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:bdd003120eacc7c3afc97630a71c3865f1b127aa6f424f72e21ce0c0e135cc75 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_INFINIBAND_CNI_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:150971baaf9663a24959b937eea6527934b3af6696357f0c235e496dd7679191 + value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:ad4915e1c2e77983b2ea7a735e07583ef76cbdece382c2ebb71a969c57438ab6 - op: add path: /spec/template/spec/containers/0/env/- value: name: RDMA_CNI_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:529a142daaacef07b226ec32901a5e20840fa448b7b9695206bfae501510c12c + value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:0685afb91b52f1e1ffb4b9a14ece7dde5c29d5c2f05fa8a348be6408b9f32713 - op: add path: /spec/template/spec/containers/0/env/- value: name: METRICS_EXPORTER_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:150ab64455da79c26206594c06e120d1895d64d500616c74527d35cf1a6e53bd + value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:3ceea37243660016b6f215a1d35c90a30ba4c1c3f0e5ba70161e35e99de50948 - op: add path: /spec/template/spec/containers/0/env/- value: name: METRICS_EXPORTER_KUBE_RBAC_PROXY_IMAGE - value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:9015fcc16550ac84be79e71e77b4ac2bce923e1ef1f967b1b0cde5e7b8df0eb3 + value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:4e3d260724e48b52768940e585815964eab192d10a724de9c761d7075e52bcff target: kind: Deployment name: sriov-network-operator diff --git a/assets/optional/sriov/kustomization.x86_64.yaml b/assets/optional/sriov/kustomization.x86_64.yaml index b2052fcac3..3bb015fc81 100644 --- a/assets/optional/sriov/kustomization.x86_64.yaml +++ b/assets/optional/sriov/kustomization.x86_64.yaml @@ -1,7 +1,7 @@ images: - name: quay.io/openshift/sriov-network-operator newName: registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator - digest: sha256:698a45b1d8fda40d37c64dd5cf2d7380a8ea57c02c4a7df4faa217744567b943 + digest: sha256:e16da39706b82fd8b145cea1db4402b9c08b1b283f17a7877e89df509aafe52e patches: - patch: |- @@ -9,47 +9,47 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: SRIOV_CNI_IMAGE - value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:3271753f822f87cc8d6316dca3395b5c0c2e442f85018e08fd38b9118a48f22c + value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:87f9d2638c17225c04fed21c5476b0cb4a2a62e4a8ea298607dc8e76906e99f9 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_DEVICE_PLUGIN_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:7fea9d7749ab5c9fa3416a832f43641953edbdd53228948f9d5a51aa9012460b + value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:726c9809f3d131644cd0a605c47d4190c941165a078058dba50218a1993bca9b - op: add path: /spec/template/spec/containers/0/env/- value: name: NETWORK_RESOURCES_INJECTOR_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:2b653e893913c7d9fec3a95fb7bc56055ce0530993e44ce2e768b26f26680383 + value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:05bec1acb4221b37ea2d674a526b2dabe9c928967625462e0e91956421c88f6b - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_NETWORK_CONFIG_DAEMON_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:42567053ef707d75fdcb1982b8057c4f641665457c1e0734601384a2d9e661e2 + value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:848b8f55b0fa02133fd62677642b243b2c5f4ac55180b745bf37c006e7b23008 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_NETWORK_WEBHOOK_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:5ddd012077ea5044ef76d72e51d422d4db67fc42dd6e08248cb8623385db922a + value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:b19469c807fc423ad278e1df316223d120f8a10023d868d9894dfcefac43b7c8 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_INFINIBAND_CNI_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:b22b99a1ada66fc7df460e9a008c37897f05e58758a418f4621a5358e4aa3677 + value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:577b0e0307913f32a35e8ad978e44d4ad090cffbbab35e080de5b3f444434b70 - op: add path: /spec/template/spec/containers/0/env/- value: name: RDMA_CNI_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:1c9349f3ae515382a96fb5b3921aaa7fb4ded80ee3ba889ed4a0c67054077fb7 + value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:44223391286d339b7836cfd81c87edf782914e990fb334c4659c0d24517b47e2 - op: add path: /spec/template/spec/containers/0/env/- value: name: METRICS_EXPORTER_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:0f63c7ba3aca11bb60672d9a65b4dc275fe87fcece753e5198232a428e7c3257 + value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:4bdb9144e6aea742a1d37f9d64827c02df196e9697ed6e38f3f2a780f077548a - op: add path: /spec/template/spec/containers/0/env/- value: name: METRICS_EXPORTER_KUBE_RBAC_PROXY_IMAGE - value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:61bc81ad1f2cb0f5e69583b43061c312c30bd0f5cd3c4005d5000c796eaa2429 + value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:8d90ad1a288f986ba671864084887e01395d273c801235ba4115291de5cb9fd2 target: kind: Deployment name: sriov-network-operator diff --git a/assets/optional/sriov/release-sriov-aarch64.json b/assets/optional/sriov/release-sriov-aarch64.json index 44c1f9b5ff..b3a7db65ca 100644 --- a/assets/optional/sriov/release-sriov-aarch64.json +++ b/assets/optional/sriov/release-sriov-aarch64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.20.0-202607171900" + "base": "4.20.0-202607290013" }, "images": { - "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:150ab64455da79c26206594c06e120d1895d64d500616c74527d35cf1a6e53bd", - "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:9015fcc16550ac84be79e71e77b4ac2bce923e1ef1f967b1b0cde5e7b8df0eb3", - "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:540b6bf2abd31ec83d431b602c2e12e0f99ed4ab36fff776baf3417d26a40fc1", - "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:529a142daaacef07b226ec32901a5e20840fa448b7b9695206bfae501510c12c", - "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:a2042c240acaac54b214a3ea4e436c92c72c16111f093279048cb27ef38a1cd6", - "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:0bb0c9b01fa23dd1a3ba6334fd8dc418a62992bdae7579c28002947d200eac6f", - "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:150971baaf9663a24959b937eea6527934b3af6696357f0c235e496dd7679191", - "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:89b210aee5cdabe41dfd25f04107a56cd145c36c3ad67f7ee900e3b01bf2c944", - "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:cf022b3d699c7f2988efa0ab32722c951bad164f1ef5e13adfc062fb46b47c1d", - "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:6db37040285eab4deaeb550f3d597d0962513244021f70241e38776db16d9e09" + "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:3ceea37243660016b6f215a1d35c90a30ba4c1c3f0e5ba70161e35e99de50948", + "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:4e3d260724e48b52768940e585815964eab192d10a724de9c761d7075e52bcff", + "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:4ecee4770f2a1be0032a001db1008e81b985656cfd4b1e410362888564da7416", + "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:0685afb91b52f1e1ffb4b9a14ece7dde5c29d5c2f05fa8a348be6408b9f32713", + "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:de745411f2dcc1ecfb2a5014b281677987a70563895cd8c0808733ea756fe997", + "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:9ec8140328ab98c3f78bf94557abe44fd863469cff58dc5d49c64efea48ffd3c", + "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:ad4915e1c2e77983b2ea7a735e07583ef76cbdece382c2ebb71a969c57438ab6", + "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:6f9e48ae07d12017d61726c2947e633fb5eab7c201efbb2fed658171a131c6c6", + "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:d78dd37a7dcbf23f11a5bc2da194eddaaf169ac35c1ac9057d8b46c2662c4ff3", + "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:bdd003120eacc7c3afc97630a71c3865f1b127aa6f424f72e21ce0c0e135cc75" } } diff --git a/assets/optional/sriov/release-sriov-x86_64.json b/assets/optional/sriov/release-sriov-x86_64.json index 7f11eac87e..db3ed5d904 100644 --- a/assets/optional/sriov/release-sriov-x86_64.json +++ b/assets/optional/sriov/release-sriov-x86_64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.20.0-202607171900" + "base": "4.20.0-202607290013" }, "images": { - "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:0f63c7ba3aca11bb60672d9a65b4dc275fe87fcece753e5198232a428e7c3257", - "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:61bc81ad1f2cb0f5e69583b43061c312c30bd0f5cd3c4005d5000c796eaa2429", - "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:2b653e893913c7d9fec3a95fb7bc56055ce0530993e44ce2e768b26f26680383", - "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:1c9349f3ae515382a96fb5b3921aaa7fb4ded80ee3ba889ed4a0c67054077fb7", - "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:3271753f822f87cc8d6316dca3395b5c0c2e442f85018e08fd38b9118a48f22c", - "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:7fea9d7749ab5c9fa3416a832f43641953edbdd53228948f9d5a51aa9012460b", - "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:b22b99a1ada66fc7df460e9a008c37897f05e58758a418f4621a5358e4aa3677", - "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:42567053ef707d75fdcb1982b8057c4f641665457c1e0734601384a2d9e661e2", - "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:698a45b1d8fda40d37c64dd5cf2d7380a8ea57c02c4a7df4faa217744567b943", - "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:5ddd012077ea5044ef76d72e51d422d4db67fc42dd6e08248cb8623385db922a" + "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:4bdb9144e6aea742a1d37f9d64827c02df196e9697ed6e38f3f2a780f077548a", + "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:8d90ad1a288f986ba671864084887e01395d273c801235ba4115291de5cb9fd2", + "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:05bec1acb4221b37ea2d674a526b2dabe9c928967625462e0e91956421c88f6b", + "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:44223391286d339b7836cfd81c87edf782914e990fb334c4659c0d24517b47e2", + "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:87f9d2638c17225c04fed21c5476b0cb4a2a62e4a8ea298607dc8e76906e99f9", + "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:726c9809f3d131644cd0a605c47d4190c941165a078058dba50218a1993bca9b", + "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:577b0e0307913f32a35e8ad978e44d4ad090cffbbab35e080de5b3f444434b70", + "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:848b8f55b0fa02133fd62677642b243b2c5f4ac55180b745bf37c006e7b23008", + "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:e16da39706b82fd8b145cea1db4402b9c08b1b283f17a7877e89df509aafe52e", + "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:b19469c807fc423ad278e1df316223d120f8a10023d868d9894dfcefac43b7c8" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index bc1578fd92..b6689a4206 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.21.0-0.nightly-arm64-2026-07-30-012031" + "base": "4.21.0-0.nightly-arm64-2026-08-10-005412" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4baf1d2392143728f7bcfafa26f24161592ada6c2da1608948834b38e7f80cd", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7394d5614d1a3800d32b36e148fbdbc3222bf5fa8a163847defba671166e5f83", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b423908ca895043987974d0867ee91b53e6402901789bc213cdcd95636d9ebad", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c20434325db1d2bd2644973e58966f8d8ca3793afd8df875a96a60e381571bb6", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:27b055a8e68fc5ae38873def2c966509e7d82d479d3dba4e59c4ad13875c1f52", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9366e77f7a8b66da74086330db3b12101804f318a166fc509bcb814dd3561fa0", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff5360ca1a513ce4f6ba3bdd77200ec5c87594c89a62e3dada56e9bbe0f19319", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:de0c0f80836973d02be8ee02ea5cea3c966ce326f289c6015128f97801654392", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df15984f41af484fe380aa692b3d86160d3de5c9d6c40738d1acdba88cc059dc", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:259bbfe85e90fcfe10cb444ba6d53947317e23ee700fe78fb1c1db9217ea7845", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1688b4666ca90f0651c4bc4a5933e9e189ef979f8b8f657ad86729e94fcdbab9", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe42ad050cf88245d00ac1ff2fb9d5d81ccafe11c5de0d44c7c35fda34f1430e", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f8624a73e6a9d89b9c4d57b67092a11bb7fcb62f306c157083ab9e02e88d6f47", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c07b7d4f068a8f7281803bc088388e1694bcdba5a12340058dc68f3c05efe3e", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:e77365e44676fbd8ab9e4ce53f3a406856bbdfef3467c545a7df1197d84477af", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:70d7afe32fae42cca5ec97fe6dd7a655f9a08ceaa93d90d7dd1fece4fed74fbd" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c42707769b7a5c8be8cec5ff17276756c8ce889e2c8583d3d1e9c7e8971210d" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index c8089b0316..eac6f3ae8e 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.21.0-0.nightly-2026-07-29-083019" + "base": "4.21.0-0.nightly-2026-08-07-125427" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:730fa7709307d35d83d2e666aa18b806ac4bd9233d101484098d3a1220a60522", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01e18fb81efe1a975cc7a693564ed3fcb640d9d4c6fdefb9a70633eb4c351270", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:792bb54c2117d37e78e2c9a8297a65ed8e1907a48ad6bcf07ffdcc0c21a69971", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:147ac00be29b9429bcad4164df488d1e5767c59c69af11b4fd9d61812dbf50b7", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17b4a8b209a337f775731c66dc2e2f4d741fafcb362cfb1ba4cefbf5ea485c9c", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d48cf4e9f495309b3c2e89f27712488d3082e0f1a87f2f04e27ce158aeb3f6a", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9001817b7ad6bf355a12f4f92671ac8625c4f4ce26ca7fb67657b05fcd5d945", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3363531b7d64004c0a09f4f2b07f1a3ea84a9ec19409c10edc052e9756161c4a", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f3a5f5d02ac600f0fc400cd77ad9e1e827965ce4121830d371c3223cb67640ed", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d24c9eb297c0e96c46a6bdf28b82b60fc8eb0b80380665ac6a36eb064ac4f0e", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ec27fe0bd8ad9cffc44454171da53d18a330a3778d0c8d79403f440915205d2", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1772b4f4b08503af4876d0544629715dade4c17104faaf0ab20620c1049d908e", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22b3a43ea06dca47d8fb78b4139b6ee6d1520f6d2853d3501499962086064a68", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc9b3fb63ce066aff50326ae5ea411bb49b3a1e6b98593e938f3d7674a7374c4", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:10c9ccab4f2857d113b55e12cac29aed0dc97d5a4e29ed2e4ea0f77551ee55f8", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9f03572ac8e5086eb916a6c38cf742c7449c5bae9a0797c121451d5383554c2" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:06c718c74489a4ba9bf8192eb826af3dc108fcf07ad36b7d768ac608aa172d0a" } } diff --git a/etcd/go.mod b/etcd/go.mod index b370595608..a1eba64faa 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -147,11 +147,11 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251001123353-fd5b1fb35db1 // from kubernetes - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20251111143920-806f690e1f14 // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 // from etcd - go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 // from etcd - go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260803133257-b6dda5413ec3 // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 // from etcd + go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 // from etcd + go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 // from etcd ) replace ( diff --git a/etcd/go.sum b/etcd/go.sum index 093362e300..368df6dc7b 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -137,16 +137,16 @@ github.com/openshift/api v0.0.0-20260710095909-1cb630ce7109 h1:0aFlPaDL1r0+EUNJx github.com/openshift/api v0.0.0-20260710095909-1cb630ce7109/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY= github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af h1:UiYYMi/CCV+kwWrXuXfuUSOY2yNXOpWpNVgHc6aLQlE= github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE= -github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 h1:3fyOgcjFbMjZgVGYGZvSTH8Zi5LavfXVwwjnAZOfpQA= -github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14/go.mod h1:ob0/oWA/UQQlT1BmaEkWQzI0sJ1M0Et0mMpaABxguOQ= -github.com/openshift/etcd/client/pkg/v3 v3.0.0-20251111143920-806f690e1f14 h1:dXIOqD1issPq7FFvWUcZ20QHi/tJ0bn0egqTDW0PuCU= -github.com/openshift/etcd/client/pkg/v3 v3.0.0-20251111143920-806f690e1f14/go.mod h1:8Wx3eGRPiy0qOFMZT/hfvdos+DjEaPxdIDiCDUv/FQk= -github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 h1:Eogcz8Tix+Lbh2poNuOKmVcYcxTT0ymeJLQB5jhJafk= -github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14/go.mod h1:ZqwG/7TAFZ0BJ0jXRPoJjKQJtbFo/9NIY8uoFFKcCyo= -github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 h1:Ndy/MFW8U36LJsXWfP8AP3shZvpyQqb3h3PXjVFQdeE= -github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14/go.mod h1:uqrXrzmMIJDEy5j00bCqhVLzR5jEJIwDp5wTlLwPGOU= -github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 h1:SpT3jxkbfO6cx9UH3dcDCmqBkbUuioFhqqYJRLlU1Rc= -github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14/go.mod h1:PLuhyVXz8WWRhzXDsl3A3zv/+aK9e4A9lpQkqawIaH0= +github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 h1:bZaBNaUXqFL0q6K3hPBLSDvpUIe/Qf7OongDGLUtFKg= +github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3/go.mod h1:ob0/oWA/UQQlT1BmaEkWQzI0sJ1M0Et0mMpaABxguOQ= +github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260803133257-b6dda5413ec3 h1:Fl9ein4BYBftiHACzuwnCSbxHS5EOIUlkcqR8ht3t14= +github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260803133257-b6dda5413ec3/go.mod h1:8Wx3eGRPiy0qOFMZT/hfvdos+DjEaPxdIDiCDUv/FQk= +github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 h1:5w19f524lHps4KBshBW8K7Z0vTH4+sLIWwOY5JT6GRI= +github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3/go.mod h1:ZqwG/7TAFZ0BJ0jXRPoJjKQJtbFo/9NIY8uoFFKcCyo= +github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 h1:QpeLgEmB9D+SsQ6Gyoo1+y/uvzR88LjnL/fHzAerSSQ= +github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3/go.mod h1:uqrXrzmMIJDEy5j00bCqhVLzR5jEJIwDp5wTlLwPGOU= +github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 h1:dlqvc6dKekQ86pVObL/GEZ3zKw1/ZnZqaKbfpATl+Ko= +github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3/go.mod h1:PLuhyVXz8WWRhzXDsl3A3zv/+aK9e4A9lpQkqawIaH0= github.com/openshift/library-go v0.0.0-20251112091634-ab97ebb73f0f h1:r1pLosA7z3+t+lzW29FU54sg4/pAWu+lsKD0L5Gx3wg= github.com/openshift/library-go v0.0.0-20251112091634-ab97ebb73f0f/go.mod h1:ErDfiIrPHH+menTP/B4LKd0nxFDdvCbTamAc6SWMIh8= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251001123353-fd5b1fb35db1 h1:PMTgifBcBRLJJiM+LgSzPDTk9/Rx4qS09OUrfpY6GBQ= diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/storage/mvcc/watchable_store.go b/etcd/vendor/go.etcd.io/etcd/server/v3/storage/mvcc/watchable_store.go index 67b2d7f2d3..1a1d99fed4 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/storage/mvcc/watchable_store.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/storage/mvcc/watchable_store.go @@ -226,7 +226,6 @@ func (s *watchableStore) syncWatchersLoop() { delayTicker := time.NewTicker(watchResyncPeriod) defer delayTicker.Stop() - var evs []mvccpb.Event for { s.mu.RLock() @@ -236,7 +235,7 @@ func (s *watchableStore) syncWatchersLoop() { unsyncedWatchers := 0 if lastUnsyncedWatchers > 0 { - unsyncedWatchers, evs = s.syncWatchers(evs) + unsyncedWatchers = s.syncWatchers() } syncDuration := time.Since(st) @@ -344,12 +343,12 @@ func (s *watchableStore) moveVictims() (moved int) { // 2. iterate over the set to get the minimum revision and remove compacted watchers // 3. use minimum revision to get all key-value pairs and send those events to watchers // 4. remove synced watchers in set from unsynced group and move to synced group -func (s *watchableStore) syncWatchers(evs []mvccpb.Event) (int, []mvccpb.Event) { +func (s *watchableStore) syncWatchers() int { s.mu.Lock() defer s.mu.Unlock() if s.unsynced.size() == 0 { - return 0, []mvccpb.Event{} + return 0 } s.store.revMu.RLock() @@ -362,7 +361,7 @@ func (s *watchableStore) syncWatchers(evs []mvccpb.Event) (int, []mvccpb.Event) compactionRev := s.store.compactMainRev wg, minRev := s.unsynced.choose(maxWatchersPerSync, curRev, compactionRev) - evs = rangeEventsWithReuse(s.store.lg, s.store.b, evs, minRev, curRev+1) + evs := rangeEvents(s.store.lg, s.store.b, minRev, curRev+1, wg) victims := make(watcherBatch) wb := newWatcherBatch(wg, evs) @@ -411,43 +410,15 @@ func (s *watchableStore) syncWatchers(evs []mvccpb.Event) (int, []mvccpb.Event) } slowWatcherGauge.Set(float64(s.unsynced.size() + vsz)) - return s.unsynced.size(), evs -} - -// rangeEventsWithReuse returns events in range [minRev, maxRev), while reusing already provided events. -func rangeEventsWithReuse(lg *zap.Logger, b backend.Backend, evs []mvccpb.Event, minRev, maxRev int64) []mvccpb.Event { - if len(evs) == 0 { - return rangeEvents(lg, b, minRev, maxRev) - } - // append from left - if evs[0].Kv.ModRevision > minRev { - evs = append(rangeEvents(lg, b, minRev, evs[0].Kv.ModRevision), evs...) - } - // cut from left - prefixIndex := 0 - for prefixIndex < len(evs) && evs[prefixIndex].Kv.ModRevision < minRev { - prefixIndex++ - } - evs = evs[prefixIndex:] - - if len(evs) == 0 { - return rangeEvents(lg, b, minRev, maxRev) - } - // append from right - if evs[len(evs)-1].Kv.ModRevision+1 < maxRev { - evs = append(evs, rangeEvents(lg, b, evs[len(evs)-1].Kv.ModRevision+1, maxRev)...) - } - // cut from right - suffixIndex := len(evs) - 1 - for suffixIndex >= 0 && evs[suffixIndex].Kv.ModRevision >= maxRev { - suffixIndex-- - } - evs = evs[:suffixIndex+1] - return evs + return s.unsynced.size() } // rangeEvents returns events in range [minRev, maxRev). -func rangeEvents(lg *zap.Logger, b backend.Backend, minRev, maxRev int64) []mvccpb.Event { +func rangeEvents(lg *zap.Logger, b backend.Backend, minRev, maxRev int64, c contains) []mvccpb.Event { + if minRev < 0 { + lg.Warn("Unexpected negative revision range start", zap.Int64("minRev", minRev)) + minRev = 0 + } minBytes, maxBytes := NewRevBytes(), NewRevBytes() minBytes = RevToBytes(Revision{Main: minRev}, minBytes) maxBytes = RevToBytes(Revision{Main: maxRev}, maxBytes) @@ -457,7 +428,7 @@ func rangeEvents(lg *zap.Logger, b backend.Backend, minRev, maxRev int64) []mvcc tx := b.ReadTx() tx.RLock() revs, vs := tx.UnsafeRange(schema.Key, minBytes, maxBytes, 0) - evs := kvsToEvents(lg, revs, vs) + evs := kvsToEvents(lg, c, revs, vs) // Must unlock after kvsToEvents, because vs (come from boltdb memory) is not deep copy. // We can only unlock after Unmarshal, which will do deep copy. // Otherwise we will trigger SIGSEGV during boltdb re-mmap. @@ -465,14 +436,22 @@ func rangeEvents(lg *zap.Logger, b backend.Backend, minRev, maxRev int64) []mvcc return evs } +type contains interface { + contains(string) bool +} + // kvsToEvents gets all events for the watchers from all key-value pairs -func kvsToEvents(lg *zap.Logger, revs, vals [][]byte) (evs []mvccpb.Event) { +func kvsToEvents(lg *zap.Logger, c contains, revs, vals [][]byte) (evs []mvccpb.Event) { for i, v := range vals { var kv mvccpb.KeyValue if err := kv.Unmarshal(v); err != nil { lg.Panic("failed to unmarshal mvccpb.KeyValue", zap.Error(err)) } + if !c.contains(string(kv.Key)) { + continue + } + ty := mvccpb.PUT if isTombstone(revs[i]) { ty = mvccpb.DELETE diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 59f1aa63cc..f696c57d07 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -276,7 +276,7 @@ go.etcd.io/bbolt go.etcd.io/bbolt/errors go.etcd.io/bbolt/internal/common go.etcd.io/bbolt/internal/freelist -# go.etcd.io/etcd/api/v3 v3.6.5 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 +# go.etcd.io/etcd/api/v3 v3.6.5 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 ## explicit; go 1.24 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -286,7 +286,7 @@ go.etcd.io/etcd/api/v3/mvccpb go.etcd.io/etcd/api/v3/v3rpc/rpctypes go.etcd.io/etcd/api/v3/version go.etcd.io/etcd/api/v3/versionpb -# go.etcd.io/etcd/client/pkg/v3 v3.6.5 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20251111143920-806f690e1f14 +# go.etcd.io/etcd/client/pkg/v3 v3.6.5 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260803133257-b6dda5413ec3 ## explicit; go 1.24 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -297,14 +297,14 @@ go.etcd.io/etcd/client/pkg/v3/tlsutil go.etcd.io/etcd/client/pkg/v3/transport go.etcd.io/etcd/client/pkg/v3/types go.etcd.io/etcd/client/pkg/v3/verify -# go.etcd.io/etcd/client/v3 v3.6.5 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 +# go.etcd.io/etcd/client/v3 v3.6.5 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 ## explicit; go 1.24 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/concurrency go.etcd.io/etcd/client/v3/credentials go.etcd.io/etcd/client/v3/internal/endpoint go.etcd.io/etcd/client/v3/internal/resolver -# go.etcd.io/etcd/pkg/v3 v3.6.5 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 +# go.etcd.io/etcd/pkg/v3 v3.6.5 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 ## explicit; go 1.24 go.etcd.io/etcd/pkg/v3/adt go.etcd.io/etcd/pkg/v3/contention @@ -323,7 +323,7 @@ go.etcd.io/etcd/pkg/v3/runtime go.etcd.io/etcd/pkg/v3/schedule go.etcd.io/etcd/pkg/v3/traceutil go.etcd.io/etcd/pkg/v3/wait -# go.etcd.io/etcd/server/v3 v3.6.4 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 +# go.etcd.io/etcd/server/v3 v3.6.4 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 ## explicit; go 1.24 go.etcd.io/etcd/server/v3/auth go.etcd.io/etcd/server/v3/config @@ -1101,11 +1101,11 @@ sigs.k8s.io/yaml/kyaml # github.com/openshift/microshift/pkg/config => ../pkg/config # github.com/openshift/microshift/pkg/util/cryptomaterial => ../pkg/util/cryptomaterial # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251001123353-fd5b1fb35db1 -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20251111143920-806f690e1f14 -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 -# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 -# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260803133257-b6dda5413ec3 +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 +# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 +# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 # 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 diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 864f5b424e..450c188641 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:4d48cf4e9f495309b3c2e89f27712488d3082e0f1a87f2f04e27ce158aeb3f6a" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22b3a43ea06dca47d8fb78b4139b6ee6d1520f6d2853d3501499962086064a68" 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 22c4e48b9f..c9a4cb6ca6 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-v4.0-art-dev@sha256:9366e77f7a8b66da74086330db3b12101804f318a166fc509bcb814dd3561fa0" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f8624a73e6a9d89b9c4d57b67092a11bb7fcb62f306c157083ab9e02e88d6f47" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 5a8e7d6a8a..9f6f2301a3 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +1,140 @@ -- cluster-ingress-operator embedded-component a61dd582e6d93dd45dc75476dacb22907d5294a3 to 172349116c92d6b0d9cf56610be99de2115ae726 - - 98f5ae0 2026-07-27T15:58:00Z E2E test for internal LB creation +- cluster-ingress-operator embedded-component 172349116c92d6b0d9cf56610be99de2115ae726 to 3da316787326c64b8e844f7cb7da3a05b78a1337 + - a59b6c2 2026-07-22T14:43:01Z OCPBUGS-77457: Respect proxy configuration on gwapi provisioning + +- cluster-network-operator embedded-component 72b5cba20082e859643ae3c4fc4e83ef2ae6fe20 to 83a7d5c233e26c9bb858c93f556dcbe9f653f032 + - 8a46393 2026-07-24T16:53:27Z Bump frr-k8s MAX_FDS from 1024 to 65536 + +- etcd embedded-component 806f690e1f140e0aea2eb05ef5f288b756b62895 to b6dda5413ec33fc88fc9751d98d3b4bd96ea877d + - 0ff063b9 2026-07-30T23:13:10Z UPSTREAM: 21443: Revert "Reuse events between sync loops" + +- machine-config-operator embedded-component 0ba66a27bc734f20b2982d2d874b8bada58b78fd to b2a0caa8621c126f2f19a68ed9df0d91effcd77e + - c62c9111 2026-08-06T04:41:56Z chore: update AMIs + +- oc image-amd64 0276efa6de22b45e3c2915423fd203555382ff1c to 0aac049d01cfc3af876c5338576144773cbfa969 + - d85baabd 2026-08-05T09:51:04+02:00 Revert "Merge pull request #2310 from ricardomaraschini/OCPBUGS-98550" + +- ovn-kubernetes image-amd64 9f20d9cb39b32feb1dc2d4b1b33e686c9a3d8d9b to 632e2e203b9f9c32b2bc9b5d6708d447d1221946 + - 51047fae 2026-07-17T20:27:56+05:30 sync test annotations with upstream changes + - b05c351c 2026-07-17T20:27:53+05:30 Adapt OTE for E2E L3 CUDN multisubnet backward compatibility fixes + - 70a2009b 2026-07-17T10:23:14+02:00 e2e(kubevirt): deflake "with pre-copy fails" migration test + - fa8e140a 2026-07-16T15:33:44+02:00 Fix traffic leak in egress IP on secondary interface + - 8bce7389 2026-07-16T10:32:40+02:00 node: use libovsdb instead of ovs-vsctl exec in checkPorts + - 7b2e6eb5 2026-07-16T00:32:34+02:00 ci: cover dynamic UDN allocation on a no-overlay shared-gateway lane + - 1b7e0ec0 2026-07-16T00:32:34+02:00 e2e: adapt advertised network isolation tests to dynamic UDN allocation + - 156b75f9 2026-07-16T00:32:34+02:00 e2e: adapt CUDN advertisement tests to dynamic UDN allocation + - 501cc079 2026-07-16T00:32:34+02:00 e2e: cover RouteAdvertisements over a dynamically allocated CUDN + - 8df86599 2026-07-16T00:32:34+02:00 routeadvertisements: advertise dynamic UDNs only from active nodes + - 677d6113 2026-07-15T10:03:52-07:00 clustermanager: rename node allocation controller + - 1fcfb18f 2026-07-14T16:09:34-04:00 no-overlay: host -> pods on other nodes via mp0 + - 4620cb6d 2026-07-14T10:29:15-07:00 licenses: refresh generated third-party licenses + - 8b0dd877 2026-07-14T10:29:15-07:00 cni: fold libovsdb and shell-out ConfigureOVS paths into one + - 0b276e27 2026-07-14T10:29:15-07:00 libovsdb/ops: consolidate ovs helper operations + - 49393a41 2026-07-14T16:52:06+01:00 docs: rename portSecurity to macSecurity in OKEP-3926 + - 7229c04d 2026-07-14T20:27:41+05:30 node: skip configureGlobalForwarding tests in CI without root access + - 40bd24a5 2026-07-13T17:27:35+02:00 zone_interconnect: add unit test for stale IC route cleanup + - 3f34530b 2026-07-12T10:36:43+03:00 Update OWNERS file + - 60fcdaf5 2026-07-10T18:56:40+02:00 Use new IPv6 force_forwarding sysctl if available. + - 0e3a4e06 2026-07-10T18:56:40+02:00 Don't change FORWARD table default policy for IPv4 + - 7795aba2 2026-07-10T18:56:40+02:00 Don't override FORWARD default policy when `disable-forwarding` is not set + - 92fc5160 2026-07-10T18:56:40+02:00 Update disable-gateway unit tests + - a90d60b6 2026-07-10T18:56:40+02:00 Clarify/simplify/fix "Disable Forwarding Config" docs + - bdfd82fb 2026-07-10T17:48:35+02:00 Redo the AllocateLoadBalancerNodePorts=false test cases + - dcaf6dba 2026-07-10T12:46:42+02:00 [perf] fix netpol selection for cudn-l2 job + - d447e853 2026-07-10T11:17:19+02:00 Support update of chassis-id without re-creating the node. + - 0c9edf05 2026-07-08T12:59:20-07:00 ovnkube.sh: unify gateway option loading from OVS external_ids + - 945f64d7 2026-07-08T10:33:19-07:00 test: Use proper TLS certificate validation in metrics server tests + - 98e204fe 2026-07-08T13:36:28+02:00 coderabbit: add pre-merge checks and custom validation rules + - e36fbadc 2026-07-07T20:23:30+02:00 Get pod from apiserver on retryable annotation patch failure + - 06f453b7 2026-07-07T08:13:37+02:00 e2e(kubevirt): replace echoserver with iperf3 + - 853a72fa 2026-07-06T15:06:48-07:00 libovsdb/ops: document ovs-vsctl equivalents on read wrappers + - e3e40f10 2026-07-06T15:06:48-07:00 util, libovsdb/ops: migrate NicToBridge to libovsdb + - 497f470f 2026-07-06T15:06:48-07:00 test/e2e: pin docker while importing libovsdb + - c1c5603e 2026-07-06T15:06:48-07:00 util, node: migrate nicstobridge read paths to libovsdb + - 258eb623 2026-07-06T15:06:48-07:00 node/test: migrate DPU and gateway tests to libovsdb harness + - 1a64e7db 2026-07-06T15:06:48-07:00 cni, node: migrate ConfigureOVS and delRepPort to libovsdb + - 3785f7bd 2026-07-06T15:06:48-07:00 node: move ovsClient to BaseNodeNetworkController + - a58ead15 2026-07-06T15:06:47-07:00 libovsdb/ops: add GetOVSInterface and CreateOrUpdatePodPort + - ff6d3a79 2026-07-06T15:06:47-07:00 node, controllermanager: migrate stale-port cleanup to libovsdb + - 65e3926d 2026-07-06T15:06:47-07:00 node, libovsdb/ops: migrate port-to-br shell-outs to libovsdb + - f1a554fd 2026-07-06T15:06:47-07:00 node: migrate br-exists and del-port br-int to libovsdb + - 1e4c92c6 2026-07-06T15:06:47-07:00 util, ovn-kube-util: migrate BridgeToNic to libovsdb + - 79cb19da 2026-07-06T15:06:47-07:00 libovsdb/ops: bridge-scope DeletePortWithInterfaces + - fdc69950 2026-07-06T15:06:47-07:00 node, libovsdb/ops: migrate del-br shell-outs to libovsdb + - 25b05aa5 2026-07-06T20:15:26+02:00 Only create ACCEPT rules for bypassing our own DROP rules + - fe9bd9f8 2026-07-06T20:15:26+02:00 Simplify initLocalGateway iptables/nftables setup + - 7683207e 2026-07-03T10:03:37+02:00 e2e(kubevirt): drop fedora coreos image in favor of fedora + - d9d3e374 2026-07-02T18:14:51+02:00 area-merge: prevent bot comment feedback loop + - 635a3fd7 2026-07-02T15:50:39+01:00 docs: add "future work" section to OKEP-3926 + - 69f3a5e7 2026-07-02T15:50:39+01:00 docs: simplify OKEP-3926 and add per-attachment future section + - 00e2aa81 2026-07-02T15:50:39+01:00 docs: add OKEP-3926 for disabling port security on secondary networks + - 4246d935 2026-07-02T17:56:19+08:00 docs: fix typo in OKEP 5193 CUDN spec + - e9ed7419 2026-07-01T15:50:28-07:00 OKEP-6227: Add DHCP IPAM support for localnet UDNs + - 78e42465 2026-07-01T10:34:35-04:00 config: make routing table ID start configurable + - b19a79d2 2026-06-30T10:59:13-04:00 Revert "Route DPU host no-overlay traffic through OVN" + - 6eac3a2e 2026-06-30T15:35:05+02:00 docs/e2e: clarify E2E backward compatibility requirements in OKEP template + - 585b72c2 2026-06-26T16:33:10+02:00 Allow networks to start while route advertisements settle + +- oc image-arm64 0276efa6de22b45e3c2915423fd203555382ff1c to 0aac049d01cfc3af876c5338576144773cbfa969 + - d85baabd 2026-08-05T09:51:04+02:00 Revert "Merge pull request #2310 from ricardomaraschini/OCPBUGS-98550" + +- ovn-kubernetes image-arm64 9f20d9cb39b32feb1dc2d4b1b33e686c9a3d8d9b to 632e2e203b9f9c32b2bc9b5d6708d447d1221946 + - 51047fae 2026-07-17T20:27:56+05:30 sync test annotations with upstream changes + - b05c351c 2026-07-17T20:27:53+05:30 Adapt OTE for E2E L3 CUDN multisubnet backward compatibility fixes + - 70a2009b 2026-07-17T10:23:14+02:00 e2e(kubevirt): deflake "with pre-copy fails" migration test + - fa8e140a 2026-07-16T15:33:44+02:00 Fix traffic leak in egress IP on secondary interface + - 8bce7389 2026-07-16T10:32:40+02:00 node: use libovsdb instead of ovs-vsctl exec in checkPorts + - 7b2e6eb5 2026-07-16T00:32:34+02:00 ci: cover dynamic UDN allocation on a no-overlay shared-gateway lane + - 1b7e0ec0 2026-07-16T00:32:34+02:00 e2e: adapt advertised network isolation tests to dynamic UDN allocation + - 156b75f9 2026-07-16T00:32:34+02:00 e2e: adapt CUDN advertisement tests to dynamic UDN allocation + - 501cc079 2026-07-16T00:32:34+02:00 e2e: cover RouteAdvertisements over a dynamically allocated CUDN + - 8df86599 2026-07-16T00:32:34+02:00 routeadvertisements: advertise dynamic UDNs only from active nodes + - 677d6113 2026-07-15T10:03:52-07:00 clustermanager: rename node allocation controller + - 1fcfb18f 2026-07-14T16:09:34-04:00 no-overlay: host -> pods on other nodes via mp0 + - 4620cb6d 2026-07-14T10:29:15-07:00 licenses: refresh generated third-party licenses + - 8b0dd877 2026-07-14T10:29:15-07:00 cni: fold libovsdb and shell-out ConfigureOVS paths into one + - 0b276e27 2026-07-14T10:29:15-07:00 libovsdb/ops: consolidate ovs helper operations + - 49393a41 2026-07-14T16:52:06+01:00 docs: rename portSecurity to macSecurity in OKEP-3926 + - 7229c04d 2026-07-14T20:27:41+05:30 node: skip configureGlobalForwarding tests in CI without root access + - 40bd24a5 2026-07-13T17:27:35+02:00 zone_interconnect: add unit test for stale IC route cleanup + - 3f34530b 2026-07-12T10:36:43+03:00 Update OWNERS file + - 60fcdaf5 2026-07-10T18:56:40+02:00 Use new IPv6 force_forwarding sysctl if available. + - 0e3a4e06 2026-07-10T18:56:40+02:00 Don't change FORWARD table default policy for IPv4 + - 7795aba2 2026-07-10T18:56:40+02:00 Don't override FORWARD default policy when `disable-forwarding` is not set + - 92fc5160 2026-07-10T18:56:40+02:00 Update disable-gateway unit tests + - a90d60b6 2026-07-10T18:56:40+02:00 Clarify/simplify/fix "Disable Forwarding Config" docs + - bdfd82fb 2026-07-10T17:48:35+02:00 Redo the AllocateLoadBalancerNodePorts=false test cases + - dcaf6dba 2026-07-10T12:46:42+02:00 [perf] fix netpol selection for cudn-l2 job + - d447e853 2026-07-10T11:17:19+02:00 Support update of chassis-id without re-creating the node. + - 0c9edf05 2026-07-08T12:59:20-07:00 ovnkube.sh: unify gateway option loading from OVS external_ids + - 945f64d7 2026-07-08T10:33:19-07:00 test: Use proper TLS certificate validation in metrics server tests + - 98e204fe 2026-07-08T13:36:28+02:00 coderabbit: add pre-merge checks and custom validation rules + - e36fbadc 2026-07-07T20:23:30+02:00 Get pod from apiserver on retryable annotation patch failure + - 06f453b7 2026-07-07T08:13:37+02:00 e2e(kubevirt): replace echoserver with iperf3 + - 853a72fa 2026-07-06T15:06:48-07:00 libovsdb/ops: document ovs-vsctl equivalents on read wrappers + - e3e40f10 2026-07-06T15:06:48-07:00 util, libovsdb/ops: migrate NicToBridge to libovsdb + - 497f470f 2026-07-06T15:06:48-07:00 test/e2e: pin docker while importing libovsdb + - c1c5603e 2026-07-06T15:06:48-07:00 util, node: migrate nicstobridge read paths to libovsdb + - 258eb623 2026-07-06T15:06:48-07:00 node/test: migrate DPU and gateway tests to libovsdb harness + - 1a64e7db 2026-07-06T15:06:48-07:00 cni, node: migrate ConfigureOVS and delRepPort to libovsdb + - 3785f7bd 2026-07-06T15:06:48-07:00 node: move ovsClient to BaseNodeNetworkController + - a58ead15 2026-07-06T15:06:47-07:00 libovsdb/ops: add GetOVSInterface and CreateOrUpdatePodPort + - ff6d3a79 2026-07-06T15:06:47-07:00 node, controllermanager: migrate stale-port cleanup to libovsdb + - 65e3926d 2026-07-06T15:06:47-07:00 node, libovsdb/ops: migrate port-to-br shell-outs to libovsdb + - f1a554fd 2026-07-06T15:06:47-07:00 node: migrate br-exists and del-port br-int to libovsdb + - 1e4c92c6 2026-07-06T15:06:47-07:00 util, ovn-kube-util: migrate BridgeToNic to libovsdb + - 79cb19da 2026-07-06T15:06:47-07:00 libovsdb/ops: bridge-scope DeletePortWithInterfaces + - fdc69950 2026-07-06T15:06:47-07:00 node, libovsdb/ops: migrate del-br shell-outs to libovsdb + - 25b05aa5 2026-07-06T20:15:26+02:00 Only create ACCEPT rules for bypassing our own DROP rules + - fe9bd9f8 2026-07-06T20:15:26+02:00 Simplify initLocalGateway iptables/nftables setup + - 7683207e 2026-07-03T10:03:37+02:00 e2e(kubevirt): drop fedora coreos image in favor of fedora + - d9d3e374 2026-07-02T18:14:51+02:00 area-merge: prevent bot comment feedback loop + - 635a3fd7 2026-07-02T15:50:39+01:00 docs: add "future work" section to OKEP-3926 + - 69f3a5e7 2026-07-02T15:50:39+01:00 docs: simplify OKEP-3926 and add per-attachment future section + - 00e2aa81 2026-07-02T15:50:39+01:00 docs: add OKEP-3926 for disabling port security on secondary networks + - 4246d935 2026-07-02T17:56:19+08:00 docs: fix typo in OKEP 5193 CUDN spec + - e9ed7419 2026-07-01T15:50:28-07:00 OKEP-6227: Add DHCP IPAM support for localnet UDNs + - 78e42465 2026-07-01T10:34:35-04:00 config: make routing table ID start configurable + - b19a79d2 2026-06-30T10:59:13-04:00 Revert "Route DPU host no-overlay traffic through OVN" + - 6eac3a2e 2026-06-30T15:35:05+02:00 docs/e2e: clarify E2E backward compatibility requirements in OKEP template + - 585b72c2 2026-06-26T16:33:10+02:00 Allow networks to start while route advertisements settle diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index cefd079af5..fa86e5e6b7 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,35 +1,35 @@ https://github.com/openshift/api embedded-component 1cb630ce7109e6c4780332bb8140c8c4f7157426 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 8c1ebc60a2014ab925cbad6ef255e06ea0bd72b4 https://github.com/openshift/cluster-dns-operator embedded-component 41a53fed36e6e99c7c9ceb3a699c3547ee5d9bb9 -https://github.com/openshift/cluster-ingress-operator embedded-component 172349116c92d6b0d9cf56610be99de2115ae726 +https://github.com/openshift/cluster-ingress-operator embedded-component 3da316787326c64b8e844f7cb7da3a05b78a1337 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component dc1c217c263cd220ddd2ed6fe827a466d47e3ebb https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 395de96705749de9c6a5f25747b9d5c3d5f65a8f https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 5ef1df3be41d38ddae9b3d22ce51ba486939e9f1 -https://github.com/openshift/cluster-network-operator embedded-component 72b5cba20082e859643ae3c4fc4e83ef2ae6fe20 +https://github.com/openshift/cluster-network-operator embedded-component 83a7d5c233e26c9bb858c93f556dcbe9f653f032 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 2617a201bb3607192a9f82faa18384676f611e3c https://github.com/openshift/cluster-policy-controller embedded-component e510507e20f6eb09694c880ecd79fa512a2b3470 https://github.com/openshift/csi-external-snapshotter embedded-component 2c14afc50a30de62cb00cc8263b061383cfbd3b5 -https://github.com/openshift/etcd embedded-component 806f690e1f140e0aea2eb05ef5f288b756b62895 +https://github.com/openshift/etcd embedded-component b6dda5413ec33fc88fc9751d98d3b4bd96ea877d https://github.com/openshift/kubernetes embedded-component ba6535cbb8719c3ba6c3923f2725ba050c87faab https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component ce5ff17e9a81ce754567e6dd5053d13409c251e9 -https://github.com/openshift/machine-config-operator embedded-component 0ba66a27bc734f20b2982d2d874b8bada58b78fd +https://github.com/openshift/machine-config-operator embedded-component b2a0caa8621c126f2f19a68ed9df0d91effcd77e https://github.com/openshift/openshift-controller-manager embedded-component 438d52e79d691e016d66eabfe9a53c84229db40c https://github.com/openshift/operator-framework-olm embedded-component 149d553b2057320d761c4d1913098a66787dd09a https://github.com/openshift/route-controller-manager embedded-component 166a3e96f8151d9e789b3951ae75b03cdede5081 https://github.com/openshift/service-ca-operator embedded-component e9622ba18c86bf24aceab0c19fdcb87339c14f44 -https://github.com/openshift/oc image-amd64 0276efa6de22b45e3c2915423fd203555382ff1c +https://github.com/openshift/oc image-amd64 0aac049d01cfc3af876c5338576144773cbfa969 https://github.com/openshift/coredns image-amd64 7486e9e4330c1e41d9a91e4673b7f2782efc112c https://github.com/openshift/csi-external-snapshotter image-amd64 2c14afc50a30de62cb00cc8263b061383cfbd3b5 https://github.com/openshift/router image-amd64 dc4c01d494f572773a05e82bffd19c2cdaf8dce9 https://github.com/openshift/kube-rbac-proxy image-amd64 cd636680e06a55395c26570dff0cb37277014388 -https://github.com/openshift/ovn-kubernetes image-amd64 9f20d9cb39b32feb1dc2d4b1b33e686c9a3d8d9b +https://github.com/openshift/ovn-kubernetes image-amd64 632e2e203b9f9c32b2bc9b5d6708d447d1221946 https://github.com/openshift/kubernetes image-amd64 ba6535cbb8719c3ba6c3923f2725ba050c87faab https://github.com/openshift/service-ca-operator image-amd64 e9622ba18c86bf24aceab0c19fdcb87339c14f44 -https://github.com/openshift/oc image-arm64 0276efa6de22b45e3c2915423fd203555382ff1c +https://github.com/openshift/oc image-arm64 0aac049d01cfc3af876c5338576144773cbfa969 https://github.com/openshift/coredns image-arm64 7486e9e4330c1e41d9a91e4673b7f2782efc112c https://github.com/openshift/csi-external-snapshotter image-arm64 2c14afc50a30de62cb00cc8263b061383cfbd3b5 https://github.com/openshift/router image-arm64 dc4c01d494f572773a05e82bffd19c2cdaf8dce9 https://github.com/openshift/kube-rbac-proxy image-arm64 cd636680e06a55395c26570dff0cb37277014388 -https://github.com/openshift/ovn-kubernetes image-arm64 9f20d9cb39b32feb1dc2d4b1b33e686c9a3d8d9b +https://github.com/openshift/ovn-kubernetes image-arm64 632e2e203b9f9c32b2bc9b5d6708d447d1221946 https://github.com/openshift/kubernetes image-arm64 ba6535cbb8719c3ba6c3923f2725ba050c87faab https://github.com/openshift/service-ca-operator image-arm64 e9622ba18c86bf24aceab0c19fdcb87339c14f44 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index d9c16a53fe..144aa1b11d 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.21.0-0.nightly-2026-07-29-083019" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2026-07-30-012031" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.21.0-0.nightly-2026-08-07-125427" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2026-08-10-005412"