From 0b3714aeb2244f0caaf576fe9b8a2c195f4b7a95 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 6 May 2026 04:11:26 +0000 Subject: [PATCH 1/5] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index dc8c24521b..a8a72dd08e 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-05-03-033404" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-05-03-070901" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-05-05-061625" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-05-05-134413" From 9491dd28cdbbcf712d3b410c8e9476d8bf970d0c Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 6 May 2026 04:11:27 +0000 Subject: [PATCH 2/5] update changelog --- scripts/auto-rebase/changelog.txt | 86 ++++--------------------------- scripts/auto-rebase/commits.txt | 6 +-- 2 files changed, 12 insertions(+), 80 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 293e0bfb17..72284e3415 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,80 +1,12 @@ -- kubernetes embedded-component b0a9fa695c85812aa5067be371ead2cd61de700d to da4553e9f23c91c792094a1ddbba933784becce4 - - 1a1cacf17 2026-04-17T15:00:31-07:00 UPSTREAM: : hack/update-vendor.sh, make update and update image - - 938160a29 2026-04-16T17:03:39-07:00 UPSTREAM: : manually resolve conflicts - - 7b8c6cf0e 2026-04-15T18:01:22Z Release commit for Kubernetes v1.35.4 - - 1687aa8c9 2026-04-13T14:14:40-04:00 Update github.com/moby/spdystream from v0.5.0 to v0.5.1 - - e87f6b927 2026-04-13T14:38:58Z update go.opentelemetry.io/otel to v1.41.0 - - 97ccbdf2e 2026-04-09T21:52:20+02:00 Bump images and versions to go 1.25.9 and distroless iptables - - 46ba1c3c2 2026-03-31T12:33:40-04:00 Deflake TestPodSubresourceAuth by waiting for effective permissions before testing - - 1d5e94efa 2026-03-27T19:44:50Z podresources: filter out inactive pods in Get() - - 91a1e8b2d 2026-03-27T19:44:50Z e2e: node: podresources: fix expectations for Get() and terminated pods - - 9d8bbea59 2026-03-26T21:39:40Z Fix device plugin admission failure after container restart - - d8a562b64 2026-03-20T08:20:51Z Fix backport differences for 1.35 (remove WithOrigin and MarkAlpha) - - b6ee759d8 2026-03-20T08:17:42Z Add slice and map union member support with tests - - 3d39627cd 2026-03-20T08:16:18Z Use IsZero instead of IsNil for union ratcheting check - - 7b708cc7c 2026-03-20T08:16:18Z Add DRA test for device attribute with no value set - - 863ed56ac 2026-03-20T08:16:18Z Add nil OldValue test coverage for union doc_tests - - 9a39e5c49 2026-03-20T08:16:17Z Fix union validation ratcheting when oldObj is nil - - b0ec348c2 2026-03-20T08:53:35+01:00 KEP-961: demote maxUnavailable feature in statefulset to off by default - - 570f471d7 2026-03-19T19:08:41+08:00 kubelet: fix sidecar restart after kubelet restart - - 4c0429295 2026-03-18T18:41:39Z Update CHANGELOG/CHANGELOG-1.35.md for v1.35.3 - - 93de120ed 2026-03-17T08:05:07-04:00 pkg/proxy/nftables: fix kube-proxy crash with newer nftables versions - - 6b5673451 2026-03-17T08:05:07-04:00 Update knftables to v0.0.21 - - 38378d5df 2026-01-16T17:54:22Z Bugfix: calculate request latency properly in audit log filter +- cluster-ingress-operator embedded-component 2c5b4ef0021db96ba6fecf630c53a15c12134578 to 6cf59c532a28e46ced7e18c5aa4b04283fea8f61 + - 3f03fc1 2026-05-01T20:08:27Z isFIPSEnabled: Check FIPS_ENABLED env. var. first -- machine-config-operator embedded-component f72cd29b7306dcb05effc3bceee1398942d97902 to abe61bbbcbffb8d86ffb783d12eac18c172f30b0 - - 54754975 2026-05-01T14:12:42Z Fix stale MachineOSBuild annotation preventing pool updates - - d0bd4b30 2026-05-01T13:29:48Z chore: update AMIs - - 78c7d096 2026-04-30T22:32:25Z node: custom pool boot must handle matchExpressions - - 3d72058a 2026-04-30T22:32:10Z daemon: support bootloader updates - - 911d1262 2026-04-30T12:27:41Z Auto-append :ref suffix to additionalLayerStores in storage.conf - - 2df730ff 2026-04-29T23:37:17Z deploy-from-self when skopeo < 1.22.2 +- cluster-kube-apiserver-operator embedded-component e373e93ad5690ba5233512318005921ca5f47bd7 to d03062f8d205f1923362c008c86f9bcdd35f931c + - a1b09a2 2026-04-29T11:19:24-04:00 Bump library-go -- kubernetes image-amd64 b0a9fa695c85812aa5067be371ead2cd61de700d to da4553e9f23c91c792094a1ddbba933784becce4 - - 1a1cacf17 2026-04-17T15:00:31-07:00 UPSTREAM: : hack/update-vendor.sh, make update and update image - - 938160a29 2026-04-16T17:03:39-07:00 UPSTREAM: : manually resolve conflicts - - 7b8c6cf0e 2026-04-15T18:01:22Z Release commit for Kubernetes v1.35.4 - - 1687aa8c9 2026-04-13T14:14:40-04:00 Update github.com/moby/spdystream from v0.5.0 to v0.5.1 - - e87f6b927 2026-04-13T14:38:58Z update go.opentelemetry.io/otel to v1.41.0 - - 97ccbdf2e 2026-04-09T21:52:20+02:00 Bump images and versions to go 1.25.9 and distroless iptables - - 46ba1c3c2 2026-03-31T12:33:40-04:00 Deflake TestPodSubresourceAuth by waiting for effective permissions before testing - - 1d5e94efa 2026-03-27T19:44:50Z podresources: filter out inactive pods in Get() - - 91a1e8b2d 2026-03-27T19:44:50Z e2e: node: podresources: fix expectations for Get() and terminated pods - - 9d8bbea59 2026-03-26T21:39:40Z Fix device plugin admission failure after container restart - - d8a562b64 2026-03-20T08:20:51Z Fix backport differences for 1.35 (remove WithOrigin and MarkAlpha) - - b6ee759d8 2026-03-20T08:17:42Z Add slice and map union member support with tests - - 3d39627cd 2026-03-20T08:16:18Z Use IsZero instead of IsNil for union ratcheting check - - 7b708cc7c 2026-03-20T08:16:18Z Add DRA test for device attribute with no value set - - 863ed56ac 2026-03-20T08:16:18Z Add nil OldValue test coverage for union doc_tests - - 9a39e5c49 2026-03-20T08:16:17Z Fix union validation ratcheting when oldObj is nil - - b0ec348c2 2026-03-20T08:53:35+01:00 KEP-961: demote maxUnavailable feature in statefulset to off by default - - 570f471d7 2026-03-19T19:08:41+08:00 kubelet: fix sidecar restart after kubelet restart - - 4c0429295 2026-03-18T18:41:39Z Update CHANGELOG/CHANGELOG-1.35.md for v1.35.3 - - 93de120ed 2026-03-17T08:05:07-04:00 pkg/proxy/nftables: fix kube-proxy crash with newer nftables versions - - 6b5673451 2026-03-17T08:05:07-04:00 Update knftables to v0.0.21 - - 38378d5df 2026-01-16T17:54:22Z Bugfix: calculate request latency properly in audit log filter - -- kubernetes image-arm64 b0a9fa695c85812aa5067be371ead2cd61de700d to da4553e9f23c91c792094a1ddbba933784becce4 - - 1a1cacf17 2026-04-17T15:00:31-07:00 UPSTREAM: : hack/update-vendor.sh, make update and update image - - 938160a29 2026-04-16T17:03:39-07:00 UPSTREAM: : manually resolve conflicts - - 7b8c6cf0e 2026-04-15T18:01:22Z Release commit for Kubernetes v1.35.4 - - 1687aa8c9 2026-04-13T14:14:40-04:00 Update github.com/moby/spdystream from v0.5.0 to v0.5.1 - - e87f6b927 2026-04-13T14:38:58Z update go.opentelemetry.io/otel to v1.41.0 - - 97ccbdf2e 2026-04-09T21:52:20+02:00 Bump images and versions to go 1.25.9 and distroless iptables - - 46ba1c3c2 2026-03-31T12:33:40-04:00 Deflake TestPodSubresourceAuth by waiting for effective permissions before testing - - 1d5e94efa 2026-03-27T19:44:50Z podresources: filter out inactive pods in Get() - - 91a1e8b2d 2026-03-27T19:44:50Z e2e: node: podresources: fix expectations for Get() and terminated pods - - 9d8bbea59 2026-03-26T21:39:40Z Fix device plugin admission failure after container restart - - d8a562b64 2026-03-20T08:20:51Z Fix backport differences for 1.35 (remove WithOrigin and MarkAlpha) - - b6ee759d8 2026-03-20T08:17:42Z Add slice and map union member support with tests - - 3d39627cd 2026-03-20T08:16:18Z Use IsZero instead of IsNil for union ratcheting check - - 7b708cc7c 2026-03-20T08:16:18Z Add DRA test for device attribute with no value set - - 863ed56ac 2026-03-20T08:16:18Z Add nil OldValue test coverage for union doc_tests - - 9a39e5c49 2026-03-20T08:16:17Z Fix union validation ratcheting when oldObj is nil - - b0ec348c2 2026-03-20T08:53:35+01:00 KEP-961: demote maxUnavailable feature in statefulset to off by default - - 570f471d7 2026-03-19T19:08:41+08:00 kubelet: fix sidecar restart after kubelet restart - - 4c0429295 2026-03-18T18:41:39Z Update CHANGELOG/CHANGELOG-1.35.md for v1.35.3 - - 93de120ed 2026-03-17T08:05:07-04:00 pkg/proxy/nftables: fix kube-proxy crash with newer nftables versions - - 6b5673451 2026-03-17T08:05:07-04:00 Update knftables to v0.0.21 - - 38378d5df 2026-01-16T17:54:22Z Bugfix: calculate request latency properly in audit log filter +- machine-config-operator embedded-component abe61bbbcbffb8d86ffb783d12eac18c172f30b0 to 487334b7ed9bdd7c55e9eeb3a90027e5e1f927a2 + - 6d0941eb 2026-05-04T14:40:51Z Fix OCL test to handle temporarily empty current-machine-os-build annotation + - 5dd2ef5c 2026-04-30T19:24:08Z OCPBUGS-84332: Fix ssh and password rollbacks + - bd713eb5 2026-04-29T09:53:06Z OCPBUGS-83859: Fix encapsulated IGN version + - 0c488d18 2026-04-27T09:22:41Z OCPBUGS-84218: Fix units rollback if update failure diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 27d3988349..73b4394934 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,8 +1,8 @@ https://github.com/openshift/api embedded-component e9fad7d4cba1537b8af99b972370e76370de72e9 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 2c5b4ef0021db96ba6fecf630c53a15c12134578 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component e373e93ad5690ba5233512318005921ca5f47bd7 +https://github.com/openshift/cluster-ingress-operator embedded-component 6cf59c532a28e46ced7e18c5aa4b04283fea8f61 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component d03062f8d205f1923362c008c86f9bcdd35f931c https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 95150ed5dbf11370b4a06e6959c77efa13768561 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 51ea59abd057d0cef56b29b8a74efc28411d5427 https://github.com/openshift/cluster-network-operator embedded-component e20b9cb9a0b3bc293e622ef1caf70a813710ffa8 @@ -12,7 +12,7 @@ https://github.com/openshift/csi-external-snapshotter embedded-component d1bc3ff https://github.com/openshift/etcd embedded-component d8d67b8ce849f816d6d23c904098336632e2348f https://github.com/openshift/kubernetes embedded-component da4553e9f23c91c792094a1ddbba933784becce4 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 72835e43c7754356645e41031f3a99926b4d42e6 -https://github.com/openshift/machine-config-operator embedded-component abe61bbbcbffb8d86ffb783d12eac18c172f30b0 +https://github.com/openshift/machine-config-operator embedded-component 487334b7ed9bdd7c55e9eeb3a90027e5e1f927a2 https://github.com/openshift/openshift-controller-manager embedded-component 26d20feae8892f648f5b06ed3f5492fe6ffb4532 https://github.com/openshift/operator-framework-olm embedded-component e627823c743797da91b4ae8a318d2420a511b752 https://github.com/openshift/route-controller-manager embedded-component 624742d93f3a7885cf7f70985f1e23ff60da580d From c6ae16c2e1c11d8d68472d01fd4d362e9bf1ee9d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 6 May 2026 04:13:35 +0000 Subject: [PATCH 3/5] update manifests --- assets/components/multus/release-multus-aarch64.json | 2 +- assets/components/multus/release-multus-x86_64.json | 2 +- .../operator-lifecycle-manager/release-olm-aarch64.json | 2 +- .../optional/operator-lifecycle-manager/release-olm-x86_64.json | 2 +- assets/release/release-aarch64.json | 2 +- assets/release/release-x86_64.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index ca4e81a50f..626c6b6298 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.22.0-0.nightly-arm64-2026-05-03-070901" + "base": "4.22.0-0.nightly-arm64-2026-05-05-134413" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6bc294a19561dd1ea678e56b9d8429ae3746b5db78abe6bad967138d66f6f4dc", diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index f79e28255a..0014e14454 100644 --- a/assets/components/multus/release-multus-x86_64.json +++ b/assets/components/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.22.0-0.nightly-2026-05-03-033404" + "base": "4.22.0-0.nightly-2026-05-05-061625" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:276fb37cdad468e03d504e3ea57c1a8e9a1b26d4d8ccbe03ae8d9ac9abccd58e", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index c77d99c486..e9fbd436df 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.22.0-0.nightly-arm64-2026-05-03-070901" + "base": "4.22.0-0.nightly-arm64-2026-05-05-134413" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19a8f42e7f4b4bfe3c18e2c70e196f43aa71c7f3fcecd2c1eb0cf11a16b597e3", 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 00d708f7f2..5970971062 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.22.0-0.nightly-2026-05-03-033404" + "base": "4.22.0-0.nightly-2026-05-05-061625" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d69c1d9542bab05d89605a7c904797518543651e51db57ba3aa44d509ef7b8be", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 4163b63aa8..9ee3f1753f 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.22.0-0.nightly-arm64-2026-05-03-070901" + "base": "4.22.0-0.nightly-arm64-2026-05-05-134413" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83de4633d89083f64afda76ccae7ce41d23fb98c208a4dbaee4021ce8f8dd2b0", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 22758373cb..c99b80cb49 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.22.0-0.nightly-2026-05-03-033404" + "base": "4.22.0-0.nightly-2026-05-05-061625" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:233458a2060d80a33ed8c4b5c71f5865c1a1964158bd4cfcfe3685fff66b0f0b", From 36edb57b8e162286cffeb05f4522ed9322018acd Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 6 May 2026 04:13:41 +0000 Subject: [PATCH 4/5] update buildfiles --- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 9a209cf83c..ff3f77e751 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.22.0-0.nightly-arm64-2026-05-03-070901 +OCP_VERSION := 4.22.0-0.nightly-arm64-2026-05-05-134413 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 5be091f80c..338cf0790d 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.22.0-0.nightly-2026-05-03-033404 +OCP_VERSION := 4.22.0-0.nightly-2026-05-05-061625 From 04953692691bb38e8b4f33812c7806200d5442b1 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 6 May 2026 04:14:24 +0000 Subject: [PATCH 5/5] Update SR-IOV for MicroShift --- .../optional/sriov/kustomization.aarch64.yaml | 20 ++++++++--------- .../optional/sriov/kustomization.x86_64.yaml | 20 ++++++++--------- .../optional/sriov/release-sriov-aarch64.json | 22 +++++++++---------- .../optional/sriov/release-sriov-x86_64.json | 22 +++++++++---------- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/assets/optional/sriov/kustomization.aarch64.yaml b/assets/optional/sriov/kustomization.aarch64.yaml index c2b712e1bc..62806f6948 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:56c1a4eafecd9d84639062fcd22a114c84c70fcc0abff6a471b2ebad64d1c510 + digest: sha256:bd991c78d77a0fcf66b6278cebd72e1729115a5f3fe356d19a44465780f85da5 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:976c5d4287fe5c46c999bdbad3505d6a655e2f0ef36a1257e7573d540ba1c89b + value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:f0cfcc5d620abba58d9b93dea02be464aec316e084fdd732262501475da6fa53 - 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:4f58b37aebf7848490658c8d72d05d58d06e81f3eb9294bf2f316822d6a9aadb + value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:8640f32cbbfc7046ae4d444ad29180366ff6468d32113ccac87fcbdb771b613c - 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:5e4b6c894007b41b4c16bccda566fec7a374bfa00a6b501196c5a5f3fb1040bd + value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:b6906088238e2c4ee0149290ab7bfd053ddcc83199131e20a0d358c07361bfd5 - 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:07dc6cb29c0fee69abf75b81a5de3e4a1a8ec65a68c7c2e6b540ff35cde70b80 + value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:6918d9b4f422f5e3a332b69ba418322253e632f366bc90770c4e1ceba61bdcec - 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:435eb24e9d12c802966d438fd26ca13b45a05aade4e5f407299727958c36071f + value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:839937f55c16991d955079ea4cd994e3f8b3c2098d97a531c05881934954d676 - 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:7dbfa84c1952f10e6750ffb7d1353cc72d84f654c6da8ed3fec8561653721a8e + value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:08465119175ce2349639c45e23c130fdf041e5cc23a66b0b9f35e4bc7f899f93 - 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:48ef884aa59ebb56a30d94ba412b5d7e0766d0735c5c9789896c0ae5512fb764 + value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:5d738a41377c687001ef2f7d18cf7c7692984864149520b85549643987e19f5e - 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:4f1992770e52f296b576c03e628ddee9d9667534d505f87720ebbe34ee01a52c + value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:6bbb9a9e5f633ad2cabab4461d5223480ffa307cd134cdbce0d2e422b2a2b92f - 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:6d9055e8da2fb72bddfdc1cd15ca070459afb476bff70712d0cf1a6593f981d8 + value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:1a372a8f9286d74a98a69e0e15820becfd71bdd4f1d3930011fb508b41588cda 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 253a5a4c95..d5a88384bd 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:f086958acd271a3c9c094e670f5dd8179a4e044acebb719497248e51f8eb8325 + digest: sha256:7f8e7179cf8ba48da864f620664352844ccbbc3ba895b0ddf2dd37e27342728b 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:f640774752ab197447d9b399f8928e01088cba741f9f56bef887954e974552f3 + value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:d41e3385e68670f70c8f10e1a78bbbf984433b1fc74a2bf107e1e5b0b41197d4 - 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:ab1b3e26134284dcddfc6b6661856c88b6e90349760fd20b5d6cc00788cb673b + value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:6c2f8ac09bb291389f96a0595a0b774683686554255b66f7555edf8ad4df3d9c - 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:c04210bf4444c4234016a6cafbe11a7feb23444a68b9e313784cf2b0b1bacd0b + value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:9759ed6c11b6cc03f503268c1ce865779689d26877aa00609af84729398e59a2 - 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:52a0e9a3b3a301b61b191ba8b2b7181baa54ceb01e52228ad5fbc48cab477728 + value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:1acc869679679505bb1b1e9d8e1c2841cff45c9ef4ba0358f1041484f2216c3a - 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:347dd64f2d55e7da0ae5190cfdcc076e607de363f47b672212b9d220cef9f4dc + value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:984ff73d913496355c7a0f4744782f27a5a61c8555febcb61e20e2dc954d8384 - 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:eced3ac58cab27cc99f8d90344ff6cd80264a0c4f5b66e701ccb5a77c8e64b7a + value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:8e6bf579804c1cdd2118808c40d4d20a97ad4d54c6937b2b55f78ee5e08929cf - 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:9d56f0ca4ff9c75d27fbf30b93b03b993191c5749baa2edef32219c9b6b4aa67 + value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:aeb3fcd9255e204baa921228be7d9d8df167ca0e9c305ce0511ee793efd42267 - 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:bffed5c6f66fe984ef3a49220973ed01c2280dc3a9b01d5d49a583f587bce2a0 + value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:6e6962f517ca7c45453c86cbd0ed83089177b4091d4edb14346653f1b4043da4 - 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:a8cffee2e5522fe4bb17e80c8d9746f59aace8d5cabfff978fdae1f550f5c815 + value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:731316e9d5192651ed8706d614a00dc3cb02dc2c42a208ee2c9ba8426509d329 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 234594aca3..034aa0e4af 100644 --- a/assets/optional/sriov/release-sriov-aarch64.json +++ b/assets/optional/sriov/release-sriov-aarch64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.21.0-202604200818" + "base": "4.21.0-202604221819" }, "images": { - "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:4f1992770e52f296b576c03e628ddee9d9667534d505f87720ebbe34ee01a52c", - "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:6d9055e8da2fb72bddfdc1cd15ca070459afb476bff70712d0cf1a6593f981d8", - "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:5e4b6c894007b41b4c16bccda566fec7a374bfa00a6b501196c5a5f3fb1040bd", - "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:48ef884aa59ebb56a30d94ba412b5d7e0766d0735c5c9789896c0ae5512fb764", - "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:976c5d4287fe5c46c999bdbad3505d6a655e2f0ef36a1257e7573d540ba1c89b", - "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:4f58b37aebf7848490658c8d72d05d58d06e81f3eb9294bf2f316822d6a9aadb", - "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:7dbfa84c1952f10e6750ffb7d1353cc72d84f654c6da8ed3fec8561653721a8e", - "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:07dc6cb29c0fee69abf75b81a5de3e4a1a8ec65a68c7c2e6b540ff35cde70b80", - "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:56c1a4eafecd9d84639062fcd22a114c84c70fcc0abff6a471b2ebad64d1c510", - "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:435eb24e9d12c802966d438fd26ca13b45a05aade4e5f407299727958c36071f" + "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:6bbb9a9e5f633ad2cabab4461d5223480ffa307cd134cdbce0d2e422b2a2b92f", + "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:1a372a8f9286d74a98a69e0e15820becfd71bdd4f1d3930011fb508b41588cda", + "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:b6906088238e2c4ee0149290ab7bfd053ddcc83199131e20a0d358c07361bfd5", + "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:5d738a41377c687001ef2f7d18cf7c7692984864149520b85549643987e19f5e", + "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:f0cfcc5d620abba58d9b93dea02be464aec316e084fdd732262501475da6fa53", + "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:8640f32cbbfc7046ae4d444ad29180366ff6468d32113ccac87fcbdb771b613c", + "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:08465119175ce2349639c45e23c130fdf041e5cc23a66b0b9f35e4bc7f899f93", + "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:6918d9b4f422f5e3a332b69ba418322253e632f366bc90770c4e1ceba61bdcec", + "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:bd991c78d77a0fcf66b6278cebd72e1729115a5f3fe356d19a44465780f85da5", + "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:839937f55c16991d955079ea4cd994e3f8b3c2098d97a531c05881934954d676" } } diff --git a/assets/optional/sriov/release-sriov-x86_64.json b/assets/optional/sriov/release-sriov-x86_64.json index 265758fb10..3e292f9aea 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.21.0-202604200818" + "base": "4.21.0-202604221819" }, "images": { - "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:bffed5c6f66fe984ef3a49220973ed01c2280dc3a9b01d5d49a583f587bce2a0", - "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:a8cffee2e5522fe4bb17e80c8d9746f59aace8d5cabfff978fdae1f550f5c815", - "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:c04210bf4444c4234016a6cafbe11a7feb23444a68b9e313784cf2b0b1bacd0b", - "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:9d56f0ca4ff9c75d27fbf30b93b03b993191c5749baa2edef32219c9b6b4aa67", - "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:f640774752ab197447d9b399f8928e01088cba741f9f56bef887954e974552f3", - "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:ab1b3e26134284dcddfc6b6661856c88b6e90349760fd20b5d6cc00788cb673b", - "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:eced3ac58cab27cc99f8d90344ff6cd80264a0c4f5b66e701ccb5a77c8e64b7a", - "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:52a0e9a3b3a301b61b191ba8b2b7181baa54ceb01e52228ad5fbc48cab477728", - "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:f086958acd271a3c9c094e670f5dd8179a4e044acebb719497248e51f8eb8325", - "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:347dd64f2d55e7da0ae5190cfdcc076e607de363f47b672212b9d220cef9f4dc" + "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:6e6962f517ca7c45453c86cbd0ed83089177b4091d4edb14346653f1b4043da4", + "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:731316e9d5192651ed8706d614a00dc3cb02dc2c42a208ee2c9ba8426509d329", + "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:9759ed6c11b6cc03f503268c1ce865779689d26877aa00609af84729398e59a2", + "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:aeb3fcd9255e204baa921228be7d9d8df167ca0e9c305ce0511ee793efd42267", + "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:d41e3385e68670f70c8f10e1a78bbbf984433b1fc74a2bf107e1e5b0b41197d4", + "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:6c2f8ac09bb291389f96a0595a0b774683686554255b66f7555edf8ad4df3d9c", + "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:8e6bf579804c1cdd2118808c40d4d20a97ad4d54c6937b2b55f78ee5e08929cf", + "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:1acc869679679505bb1b1e9d8e1c2841cff45c9ef4ba0358f1041484f2216c3a", + "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:7f8e7179cf8ba48da864f620664352844ccbbc3ba895b0ddf2dd37e27342728b", + "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:984ff73d913496355c7a0f4744782f27a5a61c8555febcb61e20e2dc954d8384" } }