From 4e11fe6ff9ad32aaeb19828307245bc035f41a25 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 6 Jul 2026 04:56:58 +0000 Subject: [PATCH 1/6] 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 1c3e92f5a9..87b295faaa 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-06-30-192322" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-07-02-024647" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-07-05-180412" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-07-06-024647" From d015199f698f5e4ef6516f1a4429d111c4b75940 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 6 Jul 2026 04:56:58 +0000 Subject: [PATCH 2/6] update changelog --- scripts/auto-rebase/changelog.txt | 30 ++++-------------------------- scripts/auto-rebase/commits.txt | 4 ++-- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index acabbf76af..6db78eb255 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,28 +1,6 @@ -- cluster-ingress-operator embedded-component 84ebd6ef9374b0a05e83545d6334dd79c54a7861 to 531cea1bee8c085e81b0394dd47296fc4bd3fdf0 - - 5104d16 2026-06-23T21:58:20Z OCPBUGS-90505: Guard subscriptionCache creation with OLM capability check - - 729bf24 2026-06-23T21:58:20Z OCPBUGS-90505: Guard OLM watches with capability check in gatewayclass controller +- cluster-network-operator embedded-component 899d3bc685dc825fde83daaab648275d6b5dc71c to ad6c2f8350892f7e330105c1ffb10818150eec35 + - a19dae4 2026-04-30T08:59:27Z Add dedicated service account for cni-sysctl-allowlist-ds -- kubernetes embedded-component 7250fd5b9e6ffa2f127d4ae559e4adf1100d10b9 to 03c5938b61486a1fde89b5d546f57bb4c6ad1acc - - 89525b2cf 2026-06-29T16:25:44+05:30 UPSTREAM: : OCPBUGS-93787: backport kubernetes/conformance umbrella suite - -- machine-config-operator embedded-component bc792586e0100981616e406f505fdf22280f7ed7 to c038cef79a7154854bbd66a5a102cc5646c33b9a - - c038cef7 2026-06-30T14:40:46Z [release-4.22] OCPBUGS-92026: OCPEDGE-2473: feat: enabled graceful shutdown for TNF clusters (#6247) - - b1d9d396 2026-06-27T20:32:25Z OCPBUGS-88333: Fix bootupd workaround in old nodes - - 3af3abcb 2026-06-24T09:14:16Z fixed startlimit interval setting - - becb1f56 2026-06-24T09:14:16Z refactored untaint scripts - - 35f98b21 2026-06-24T09:14:16Z fix: harden error handling in taint/untaint scripts from CR feedback - - 71ffa086 2026-06-24T09:14:16Z fix: added volumeattachments wait before untainting - - b984ae1a 2026-06-24T09:14:16Z fixed kubelet checks - - f06f260f 2026-06-24T09:14:16Z untaint logic fixes - - 03582eb1 2026-06-24T09:14:16Z CR comments and bug fixes - - 6eaf607a 2026-06-24T09:14:16Z eat: add untaint-on-rejoin alert agent and remove etcd voter check from taint logic - - c59745f0 2026-06-24T09:14:16Z scripts fixes and CR comments - - a1a78d28 2026-06-24T09:14:16Z feat: initial taint addition setup - - 35c1ef8e 2026-06-17T13:36:06Z Fix kubelet certificate wait loop in criometricsproxy.yaml and update init container's volumeMount to /var/lib/kubelet - -- kubernetes image-amd64 7250fd5b9e6ffa2f127d4ae559e4adf1100d10b9 to 03c5938b61486a1fde89b5d546f57bb4c6ad1acc - - 89525b2cf 2026-06-29T16:25:44+05:30 UPSTREAM: : OCPBUGS-93787: backport kubernetes/conformance umbrella suite - -- kubernetes image-arm64 7250fd5b9e6ffa2f127d4ae559e4adf1100d10b9 to 03c5938b61486a1fde89b5d546f57bb4c6ad1acc - - 89525b2cf 2026-06-29T16:25:44+05:30 UPSTREAM: : OCPBUGS-93787: backport kubernetes/conformance umbrella suite +- machine-config-operator embedded-component c038cef79a7154854bbd66a5a102cc5646c33b9a to 2c38780866bcb511359fbab5ae1b2411c027ef36 + - 7f35df30 2026-07-01T19:37:30Z chore: update AMIs diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index ca7ee009e4..f4cbd2c82a 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -5,14 +5,14 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 531cea1 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 9c413cd4dc8c3876cc40ee85c207bf9b143f106f 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 899d3bc685dc825fde83daaab648275d6b5dc71c +https://github.com/openshift/cluster-network-operator embedded-component ad6c2f8350892f7e330105c1ffb10818150eec35 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 2d2699e4f3fabc80e402f4c090c8cf80c4517977 https://github.com/openshift/cluster-policy-controller embedded-component 44985a1306411101c84dd5081598fc928b432321 https://github.com/openshift/csi-external-snapshotter embedded-component 28f6e06357f2840c241b9cfe09d301516e681c87 https://github.com/openshift/etcd embedded-component d8d67b8ce849f816d6d23c904098336632e2348f https://github.com/openshift/kubernetes embedded-component 03c5938b61486a1fde89b5d546f57bb4c6ad1acc https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 72835e43c7754356645e41031f3a99926b4d42e6 -https://github.com/openshift/machine-config-operator embedded-component c038cef79a7154854bbd66a5a102cc5646c33b9a +https://github.com/openshift/machine-config-operator embedded-component 2c38780866bcb511359fbab5ae1b2411c027ef36 https://github.com/openshift/openshift-controller-manager embedded-component 26d20feae8892f648f5b06ed3f5492fe6ffb4532 https://github.com/openshift/operator-framework-olm embedded-component de6260e53055e10e216ec668d692a35554ab0585 https://github.com/openshift/route-controller-manager embedded-component 55f77ca4cf0328b7c4fd7736bce79ebe171a9b6b From e94d4ada650cd11c9cde7ad8ba4ae903df3d8651 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 6 Jul 2026 04:59:01 +0000 Subject: [PATCH 3/6] update component images --- packaging/crio.conf.d/10-microshift_amd64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 8fc88720e8..5ff07444d0 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:d9a936a851aa614846e369f17ddb07986cc3c001673f6d6fc3c3650519d43bd0" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4fc193185550385c0e7d3ff3e10ac3f6843aff74fd3610fbdae66184da7b4c52" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 3129abb641b2a706915ffb4cb913015c243d5956 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 6 Jul 2026 04:59:03 +0000 Subject: [PATCH 4/6] update manifests --- .../multus/kustomization.x86_64.yaml | 4 ++-- .../multus/release-multus-aarch64.json | 2 +- .../multus/release-multus-x86_64.json | 6 +++--- .../kustomization.x86_64.yaml | 10 +++++----- .../release-olm-aarch64.json | 2 +- .../release-olm-x86_64.json | 8 ++++---- assets/release/release-aarch64.json | 2 +- assets/release/release-x86_64.json | 18 +++++++++--------- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index f679ee7af3..bfa3b7cc99 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:799df1825d36135917a467d572faf667a4ad7b0521a0cd467305c52acf3a2d40 + digest: sha256:0671a12cda0a06f669dbd746641e879171cb60e1c51a2f1cdda12737f7fad419 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:aafad2b5e9c0061632ea3e463bc662d9df806cb789bc4e007d00cbf5365f9acf + digest: sha256:3c7c254fe44d7f4ff5beaa1b96e9675a3711d356fc4bc590d037a08ab20b93c6 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index ff07a29b72..b68000e8cd 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-07-02-024647" + "base": "4.22.0-0.nightly-arm64-2026-07-06-024647" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9cbcf14d8595451df02852220660955f167eb19503a5a88f4fd7f30db2308cba", diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 389c129532..3a50f0727a 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.22.0-0.nightly-2026-06-30-192322" + "base": "4.22.0-0.nightly-2026-07-05-180412" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:799df1825d36135917a467d572faf667a4ad7b0521a0cd467305c52acf3a2d40", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aafad2b5e9c0061632ea3e463bc662d9df806cb789bc4e007d00cbf5365f9acf" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0671a12cda0a06f669dbd746641e879171cb60e1c51a2f1cdda12737f7fad419", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c7c254fe44d7f4ff5beaa1b96e9675a3711d356fc4bc590d037a08ab20b93c6" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index dd153a8d89..a22ceae7b3 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:78df46b25d793223441259109365b65a41d11a7359a1ec26af904bdb467546ec + digest: sha256:9c5052966b58e01ecb0929baeaef49a44098d00983154f2cfc26e9cdadf1a7fe - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:f1c22af855b71dca887b8e526d7553c9f1eb640b7a5c04aba1fafb35db05580a + digest: sha256:07d7fcbcd84b5fb44ece3a8dac3b008d1ed39a74ea2e88fa31c35c41e513a748 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:162d42e1a13e4a0308175391f7be53b5c9ddf25598883831681b97068a4622b0 + digest: sha256:ac7014fd0ba615e0d46cdc119a5e6fc83baf7277e69cccf150e546659045b251 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:f1c22af855b71dca887b8e526d7553c9f1eb640b7a5c04aba1fafb35db05580a + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07d7fcbcd84b5fb44ece3a8dac3b008d1ed39a74ea2e88fa31c35c41e513a748 - 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:78df46b25d793223441259109365b65a41d11a7359a1ec26af904bdb467546ec + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c5052966b58e01ecb0929baeaef49a44098d00983154f2cfc26e9cdadf1a7fe 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 741070fd1c..94263ef887 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-07-02-024647" + "base": "4.22.0-0.nightly-arm64-2026-07-06-024647" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d70e9243a9f61f4e5738f8d1cb69e72ebcf3003663154a00ea4727c4327edda8", 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 a9f134b926..0e04598c5a 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.22.0-0.nightly-2026-06-30-192322" + "base": "4.22.0-0.nightly-2026-07-05-180412" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78df46b25d793223441259109365b65a41d11a7359a1ec26af904bdb467546ec", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f1c22af855b71dca887b8e526d7553c9f1eb640b7a5c04aba1fafb35db05580a", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:162d42e1a13e4a0308175391f7be53b5c9ddf25598883831681b97068a4622b0" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c5052966b58e01ecb0929baeaef49a44098d00983154f2cfc26e9cdadf1a7fe", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07d7fcbcd84b5fb44ece3a8dac3b008d1ed39a74ea2e88fa31c35c41e513a748", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac7014fd0ba615e0d46cdc119a5e6fc83baf7277e69cccf150e546659045b251" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 7bfc2adc5c..4d6785c3db 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-07-02-024647" + "base": "4.22.0-0.nightly-arm64-2026-07-06-024647" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6d17af0cebc415534bb449a115d53277b867275aa3a77b1b9766a9bfad824e7", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index fc1ae0c543..c4d5a00a2b 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.22.0-0.nightly-2026-06-30-192322" + "base": "4.22.0-0.nightly-2026-07-05-180412" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:885258f0f06be2960f3f441094666490722ff95fffbc12a23e4bcbe00c36c4ae", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8fa189c7b5bdfcdd0b4edce2b06eb38230d9fe98e58adc9414c0532bd964c120", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:153bc90eea569ab5044d5988138353ef987de06bee184d2f4864ed2c9a69d55b", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:162d42e1a13e4a0308175391f7be53b5c9ddf25598883831681b97068a4622b0", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:30d2f60e0370b31c5e6ee81158eb51fc5a0b911c9387a081d74c98f86605876a", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9a936a851aa614846e369f17ddb07986cc3c001673f6d6fc3c3650519d43bd0", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d27b24d099331ca9ac1f470216cce518efc52fb55da8e300340586cf783cd979", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ebc4962c5b44edd3a80cac3b202021c30f9702c59aee42dc0acc16429231e84e", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e039f19316a11ee06fa705750b91d7be3be14eabe8df02597d6b627b4bddef2", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02e100a470b472c66e501cccd77469c9a83722ed14a7421251c9013d508cbb7c", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac7014fd0ba615e0d46cdc119a5e6fc83baf7277e69cccf150e546659045b251", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6be06e0cb7fea17046a81d388832bb161521d7846b014849f7aca788fe091ce0", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4fc193185550385c0e7d3ff3e10ac3f6843aff74fd3610fbdae66184da7b4c52", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec11d3405db435fa4081283df4f3cd43b9ec825f5540b9de5023464e82007c74", "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:c1f3c53b389d9b60e29ffbcb235f942e5014146796a8f6225393e1bcccc5fd4a" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8826e424939ffc6c5d55448ed92dbf795ef92dc48a9bd67d1ac9295323768941" } } From 90759388e21c20a1f68ebc690795e21b74c449e8 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 6 Jul 2026 04:59:10 +0000 Subject: [PATCH 5/6] 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 68c45291a1..278f01af2f 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.22.0-0.nightly-arm64-2026-07-02-024647 +OCP_VERSION := 4.22.0-0.nightly-arm64-2026-07-06-024647 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 02fc23dfdf..3981275149 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.22.0-0.nightly-2026-06-30-192322 +OCP_VERSION := 4.22.0-0.nightly-2026-07-05-180412 From dcfb4d8fedfa8385a0b832e8137d4ae9ec2fe779 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 6 Jul 2026 04:59:47 +0000 Subject: [PATCH 6/6] 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 d1574ea6ea..6dd7a4ae3a 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:d7ee254fc9d47bd5179f76e4122983304ec75b5ea43f4defe2d0f96f04eb8690 + digest: sha256:5b33fe72cbe5486de2dca91f912b39cd757fafad1d3a984916a5ec776897cda2 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:71edd9e131252d72242756270e02b75859134de7ccbb49bd109f9b3e349c2367 + value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:a704b198ba93a09cce192cbe8fc75f6cc244e8dd5eef91ccbc30480046f39391 - 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:6be7361f4c3a345589994dc785b2cd5da3c8123c6ad56211e4af5de232800f76 + value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:bac558d1114459fba8e902e8cb5dc42dac09e1d22579132f22bb69dced8d97e2 - 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:162cbf43222d4c7943574f84f59e29f69b6996e1693db85ddee19832441a0718 + value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:5bc744e22de2110b04d0acb18dda686698dda1eb34b866198d71f26f11a6c206 - 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:6d7ed1bc1504105bbad73bc98c78a19074e81b9ea5fc1a090612086893f5130a + value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:d212a6afdd7301459bca05ad8f485cef8d92e24636c89a6c76efff73554d92e9 - 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:5142fd6ea06766233e916ee0564fdb02e75582c8154814da05f66e9695665f35 + value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:5e365ccbdb73529fc78d30e15ac2f8a324c7ee0be6a8b19cb51f183dc5e2e867 - 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:003aaeab02e56e3ea2d46cd0ac875f001f18939915fdd1bb6767a8e67e552877 + value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:1862d64b746ce762d64256a3158dc56cb391cb700d6c53a453e42aec24a0b847 - 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:e43211c222e1734a5443826afc1f1104b61457ef7b67647e5f608136a355d5d6 + value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:e0585578cdf9309bd08028d7d0fbf05c45ddcf0d768328f88ad2eedb6a5f31d8 - 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:7b7b706bc0c431f1961336b0b205c59ae8b87d89e05d54d038f67e7acfbc241c + value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:3869072b9179c673bcae7f7929abb525fbd6a8f0aaf601ce992a0a994e8fd2c4 - 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:22469fe4645b112b9db600a2eb90b93d55ea18ce2da2a8637c50ac781618c495 + value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:ed3194db7c7e8cafdcc73a706a3526fba1c419f8961d5bc69abc536e9e89a035 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 89063ce487..1e9ef893c8 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:568d7734e5bd64f9bd74b836810c1b89f2f481a4eb403d93b218604fa8a5ee62 + digest: sha256:bdaf084ae63e7179c0a60e5e809fba881cac0fc8c21de516eacfea199b54be60 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:309f2975276b6407402bd1ac0ef7a07e809845a33259283c28925ee2321271e8 + value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:539e34a367837a297ceef7fc657615280d97d02a10f503a5636cd844e91113df - 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:479a1835efcb315af7681a0c6e9cb959570e850a4cb5844a797390e27cd619c6 + value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:e0cd00e5c691226c1bdcd0c56caf8393fb1668f27aca92891f9572e90817102d - 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:671dd3ee25bb4a24ec5741cbb6b5d168d7af4e4e7e90a332913552ff6576efa0 + value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:59fef90610984eeac0b9b1d4fb74e7551e97091bd8082fd05cc9e00e30d8de47 - 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:837d9b0b190a87e6037babecde6c7667f9e69fd044620da0fc795881b6a42ad7 + value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:deda65fbe9ce9978c0543f26add8e9b648b3ac37db440a92b93891357596d08d - 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:cc70de95764cdd38fd41500e34e40640782095a84a12a797981946a95dbfdd83 + value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:232f9e8658170ff3d88bdb460265c56e4fef0a978429dee7ba18b969c7934e0f - 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:77c3b55e366168b1eb1dbdf9482595d547b8cc0a69a1655a34c873c0d3487cab + value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:ff5f87b8464c172ae1bb5cf15c370b7250bda12696491cf77197af37352122f5 - 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:7fccda1ff324927248587007f684dea1db2bfdd6d1943dd9c2d24a4a0ccda33e + value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:195f1d0d7040fb2b6b60ae9356593788c5e15ccbb8bd0e036835100b4d5fc641 - 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:8ad8a53e0df7112d0f4f0abc373bf24bbec42e3033f5b27dfe9e6be674cef94d + value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:64a524df1a3cc4d449d0962704fce2bfc65023cd2fbb954e52a2aaba2677ef2e - 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:0299bce77fb9f786465c23efc36aca6557ddea63b9642c2176b17f827addddb2 + value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:6c1c4d4bcbfa2b29b8588b68b7ce022ea65f12bec037d32dd461736b67c45d7b 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 8f84c5e58b..f1554115f4 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-202605261300" + "base": "4.21.0-202606240914" }, "images": { - "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:7b7b706bc0c431f1961336b0b205c59ae8b87d89e05d54d038f67e7acfbc241c", - "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:22469fe4645b112b9db600a2eb90b93d55ea18ce2da2a8637c50ac781618c495", - "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:162cbf43222d4c7943574f84f59e29f69b6996e1693db85ddee19832441a0718", - "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:e43211c222e1734a5443826afc1f1104b61457ef7b67647e5f608136a355d5d6", - "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:71edd9e131252d72242756270e02b75859134de7ccbb49bd109f9b3e349c2367", - "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:6be7361f4c3a345589994dc785b2cd5da3c8123c6ad56211e4af5de232800f76", - "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:003aaeab02e56e3ea2d46cd0ac875f001f18939915fdd1bb6767a8e67e552877", - "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:6d7ed1bc1504105bbad73bc98c78a19074e81b9ea5fc1a090612086893f5130a", - "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:d7ee254fc9d47bd5179f76e4122983304ec75b5ea43f4defe2d0f96f04eb8690", - "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:5142fd6ea06766233e916ee0564fdb02e75582c8154814da05f66e9695665f35" + "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:3869072b9179c673bcae7f7929abb525fbd6a8f0aaf601ce992a0a994e8fd2c4", + "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:ed3194db7c7e8cafdcc73a706a3526fba1c419f8961d5bc69abc536e9e89a035", + "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:5bc744e22de2110b04d0acb18dda686698dda1eb34b866198d71f26f11a6c206", + "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:e0585578cdf9309bd08028d7d0fbf05c45ddcf0d768328f88ad2eedb6a5f31d8", + "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:a704b198ba93a09cce192cbe8fc75f6cc244e8dd5eef91ccbc30480046f39391", + "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:bac558d1114459fba8e902e8cb5dc42dac09e1d22579132f22bb69dced8d97e2", + "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:1862d64b746ce762d64256a3158dc56cb391cb700d6c53a453e42aec24a0b847", + "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:d212a6afdd7301459bca05ad8f485cef8d92e24636c89a6c76efff73554d92e9", + "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:5b33fe72cbe5486de2dca91f912b39cd757fafad1d3a984916a5ec776897cda2", + "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:5e365ccbdb73529fc78d30e15ac2f8a324c7ee0be6a8b19cb51f183dc5e2e867" } } diff --git a/assets/optional/sriov/release-sriov-x86_64.json b/assets/optional/sriov/release-sriov-x86_64.json index 74ca5c5588..cad1a10447 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-202605261300" + "base": "4.21.0-202606240914" }, "images": { - "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:8ad8a53e0df7112d0f4f0abc373bf24bbec42e3033f5b27dfe9e6be674cef94d", - "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:0299bce77fb9f786465c23efc36aca6557ddea63b9642c2176b17f827addddb2", - "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:671dd3ee25bb4a24ec5741cbb6b5d168d7af4e4e7e90a332913552ff6576efa0", - "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:7fccda1ff324927248587007f684dea1db2bfdd6d1943dd9c2d24a4a0ccda33e", - "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:309f2975276b6407402bd1ac0ef7a07e809845a33259283c28925ee2321271e8", - "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:479a1835efcb315af7681a0c6e9cb959570e850a4cb5844a797390e27cd619c6", - "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:77c3b55e366168b1eb1dbdf9482595d547b8cc0a69a1655a34c873c0d3487cab", - "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:837d9b0b190a87e6037babecde6c7667f9e69fd044620da0fc795881b6a42ad7", - "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:568d7734e5bd64f9bd74b836810c1b89f2f481a4eb403d93b218604fa8a5ee62", - "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:cc70de95764cdd38fd41500e34e40640782095a84a12a797981946a95dbfdd83" + "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:64a524df1a3cc4d449d0962704fce2bfc65023cd2fbb954e52a2aaba2677ef2e", + "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:6c1c4d4bcbfa2b29b8588b68b7ce022ea65f12bec037d32dd461736b67c45d7b", + "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:59fef90610984eeac0b9b1d4fb74e7551e97091bd8082fd05cc9e00e30d8de47", + "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:195f1d0d7040fb2b6b60ae9356593788c5e15ccbb8bd0e036835100b4d5fc641", + "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:539e34a367837a297ceef7fc657615280d97d02a10f503a5636cd844e91113df", + "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:e0cd00e5c691226c1bdcd0c56caf8393fb1668f27aca92891f9572e90817102d", + "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:ff5f87b8464c172ae1bb5cf15c370b7250bda12696491cf77197af37352122f5", + "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:deda65fbe9ce9978c0543f26add8e9b648b3ac37db440a92b93891357596d08d", + "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:bdaf084ae63e7179c0a60e5e809fba881cac0fc8c21de516eacfea199b54be60", + "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:232f9e8658170ff3d88bdb460265c56e4fef0a978429dee7ba18b969c7934e0f" } }