From 46f3b353fd5cafca4e8701bfc27cf50288962734 Mon Sep 17 00:00:00 2001 From: Antoni Segura Puimedon Date: Wed, 27 May 2026 22:18:53 +0200 Subject: [PATCH 1/2] fix(hypershift-operator): add CPO overrides for ARO swift-nic resource limits Add Azure CPO image overrides for 4.20 and 4.21 to fix the aro.openshift.io/swift-nic extended resource limits not matching requests, which causes Kubernetes pod admission failures. 4.22 does not need an override: the fix (PR #8564, commit d6c72d15) landed before rc.5 and will be included in the GA release. - 4.20.0-4.20.24: OCPBUGS-86567 (PR #8593 cherry-pick to release-4.20) - 4.21.0-4.21.18: OCPBUGS-86416 (PR #8565 cherry-pick to release-4.21) Co-Authored-By: Claude Opus 4.6 --- .../assets/overrides.yaml | 94 +++++++++++++++---- 1 file changed, 77 insertions(+), 17 deletions(-) diff --git a/hypershift-operator/controlplaneoperator-overrides/assets/overrides.yaml b/hypershift-operator/controlplaneoperator-overrides/assets/overrides.yaml index cf8e4a2099e..e4d1ede1101 100644 --- a/hypershift-operator/controlplaneoperator-overrides/assets/overrides.yaml +++ b/hypershift-operator/controlplaneoperator-overrides/assets/overrides.yaml @@ -9,40 +9,100 @@ platforms: cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-19@sha256:88c55ea554f7e62a64e34ff8d3be45ef85ef6b80fe4e9b0240b9a1aa226f9d98 - version: 4.19.10 cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-19@sha256:88c55ea554f7e62a64e34ff8d3be45ef85ef6b80fe4e9b0240b9a1aa226f9d98 + # Beginning of OCPBUGS-86567 overrides 4.20 section - version: 4.20.0 - cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:5bbbce615fb2103b900b9eadf79abae0c23b3ea14f8a5d46d3ff63879ded4058 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb - version: 4.20.1 - cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:5bbbce615fb2103b900b9eadf79abae0c23b3ea14f8a5d46d3ff63879ded4058 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb - version: 4.20.2 - cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:5bbbce615fb2103b900b9eadf79abae0c23b3ea14f8a5d46d3ff63879ded4058 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb - version: 4.20.3 - cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:5bbbce615fb2103b900b9eadf79abae0c23b3ea14f8a5d46d3ff63879ded4058 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb - version: 4.20.4 - cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:5bbbce615fb2103b900b9eadf79abae0c23b3ea14f8a5d46d3ff63879ded4058 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb - version: 4.20.5 - cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:5bbbce615fb2103b900b9eadf79abae0c23b3ea14f8a5d46d3ff63879ded4058 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb - version: 4.20.6 - cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:5bbbce615fb2103b900b9eadf79abae0c23b3ea14f8a5d46d3ff63879ded4058 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb + - version: 4.20.7 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb - version: 4.20.8 - cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:5bbbce615fb2103b900b9eadf79abae0c23b3ea14f8a5d46d3ff63879ded4058 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb - version: 4.20.9 - cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:5bbbce615fb2103b900b9eadf79abae0c23b3ea14f8a5d46d3ff63879ded4058 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb - version: 4.20.10 - cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:5bbbce615fb2103b900b9eadf79abae0c23b3ea14f8a5d46d3ff63879ded4058 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb - version: 4.20.11 - cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:5bbbce615fb2103b900b9eadf79abae0c23b3ea14f8a5d46d3ff63879ded4058 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb - version: 4.20.12 - cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:5bbbce615fb2103b900b9eadf79abae0c23b3ea14f8a5d46d3ff63879ded4058 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb - version: 4.20.13 - cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:5bbbce615fb2103b900b9eadf79abae0c23b3ea14f8a5d46d3ff63879ded4058 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb - version: 4.20.14 - cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:5bbbce615fb2103b900b9eadf79abae0c23b3ea14f8a5d46d3ff63879ded4058 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb - version: 4.20.15 - cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:5bbbce615fb2103b900b9eadf79abae0c23b3ea14f8a5d46d3ff63879ded4058 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb - version: 4.20.16 - cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:5bbbce615fb2103b900b9eadf79abae0c23b3ea14f8a5d46d3ff63879ded4058 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb - version: 4.20.17 - cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:5bbbce615fb2103b900b9eadf79abae0c23b3ea14f8a5d46d3ff63879ded4058 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb + - version: 4.20.18 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb + - version: 4.20.19 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb + - version: 4.20.20 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb + - version: 4.20.21 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb + - version: 4.20.22 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb + - version: 4.20.23 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb + - version: 4.20.24 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-20@sha256:155e4eee5b551ba9c4f3690e677be2b7a9bf90dca0ba4e8978a39fc16b46bcbb + # End of OCPBUGS-86567 overrides 4.20 section + # Beginning of OCPBUGS-86416 overrides 4.21 section + - version: 4.21.0 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-21@sha256:1b3f1bf728e722d333f7214afb348b9d629c2134247c5440d7d98a87c34c6f61 + - version: 4.21.1 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-21@sha256:1b3f1bf728e722d333f7214afb348b9d629c2134247c5440d7d98a87c34c6f61 + - version: 4.21.2 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-21@sha256:1b3f1bf728e722d333f7214afb348b9d629c2134247c5440d7d98a87c34c6f61 + - version: 4.21.3 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-21@sha256:1b3f1bf728e722d333f7214afb348b9d629c2134247c5440d7d98a87c34c6f61 + - version: 4.21.4 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-21@sha256:1b3f1bf728e722d333f7214afb348b9d629c2134247c5440d7d98a87c34c6f61 + - version: 4.21.5 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-21@sha256:1b3f1bf728e722d333f7214afb348b9d629c2134247c5440d7d98a87c34c6f61 + - version: 4.21.6 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-21@sha256:1b3f1bf728e722d333f7214afb348b9d629c2134247c5440d7d98a87c34c6f61 + - version: 4.21.7 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-21@sha256:1b3f1bf728e722d333f7214afb348b9d629c2134247c5440d7d98a87c34c6f61 + - version: 4.21.8 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-21@sha256:1b3f1bf728e722d333f7214afb348b9d629c2134247c5440d7d98a87c34c6f61 + - version: 4.21.9 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-21@sha256:1b3f1bf728e722d333f7214afb348b9d629c2134247c5440d7d98a87c34c6f61 + - version: 4.21.10 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-21@sha256:1b3f1bf728e722d333f7214afb348b9d629c2134247c5440d7d98a87c34c6f61 + - version: 4.21.11 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-21@sha256:1b3f1bf728e722d333f7214afb348b9d629c2134247c5440d7d98a87c34c6f61 + - version: 4.21.12 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-21@sha256:1b3f1bf728e722d333f7214afb348b9d629c2134247c5440d7d98a87c34c6f61 + - version: 4.21.13 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-21@sha256:1b3f1bf728e722d333f7214afb348b9d629c2134247c5440d7d98a87c34c6f61 + - version: 4.21.14 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-21@sha256:1b3f1bf728e722d333f7214afb348b9d629c2134247c5440d7d98a87c34c6f61 + - version: 4.21.15 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-21@sha256:1b3f1bf728e722d333f7214afb348b9d629c2134247c5440d7d98a87c34c6f61 + - version: 4.21.16 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-21@sha256:1b3f1bf728e722d333f7214afb348b9d629c2134247c5440d7d98a87c34c6f61 + - version: 4.21.17 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-21@sha256:1b3f1bf728e722d333f7214afb348b9d629c2134247c5440d7d98a87c34c6f61 + - version: 4.21.18 + cpoImage: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/control-plane-operator-4-21@sha256:1b3f1bf728e722d333f7214afb348b9d629c2134247c5440d7d98a87c34c6f61 + # End of OCPBUGS-86416 overrides 4.21 section + # 4.22 does not need an override: the fix (PR #8564) landed before rc.5 + # (SOURCE_GIT_COMMIT=d6c72d15350752e315c198f7a68558ae4086e3c7) and GA will include it. testing: # Update the image refs below to indicate which images should be used for CPO override # testing. Currently, we only test one latest/previous combination. In the future, we From 60d9fe4daf3c84a168f445baabb171c1ea72752a Mon Sep 17 00:00:00 2001 From: Antoni Segura Puimedon Date: Wed, 27 May 2026 22:18:59 +0200 Subject: [PATCH 2/2] chore(contrib): add Konflux PDS definitions for CPO 4.21 and 4.22 Add ProjectDevelopmentStream YAML files for control-plane-operator versions 4.21 and 4.22, matching the existing pattern used for 4.19 and 4.20. Co-Authored-By: Claude Opus 4.6 --- contrib/konflux/cpo_4_21_stream.yaml | 11 +++++++++++ contrib/konflux/cpo_4_22_stream.yaml | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 contrib/konflux/cpo_4_21_stream.yaml create mode 100644 contrib/konflux/cpo_4_22_stream.yaml diff --git a/contrib/konflux/cpo_4_21_stream.yaml b/contrib/konflux/cpo_4_21_stream.yaml new file mode 100644 index 00000000000..84bc5bf76b5 --- /dev/null +++ b/contrib/konflux/cpo_4_21_stream.yaml @@ -0,0 +1,11 @@ +apiVersion: projctl.konflux.dev/v1beta1 +kind: ProjectDevelopmentStream +metadata: + name: control-plane-operator-v4-21 +spec: + project: crt-redhat-acm-tenant + template: + name: hypershift-cpo-template + values: + - name: version + value: "4.21" diff --git a/contrib/konflux/cpo_4_22_stream.yaml b/contrib/konflux/cpo_4_22_stream.yaml new file mode 100644 index 00000000000..bf2ae45ab06 --- /dev/null +++ b/contrib/konflux/cpo_4_22_stream.yaml @@ -0,0 +1,11 @@ +apiVersion: projctl.konflux.dev/v1beta1 +kind: ProjectDevelopmentStream +metadata: + name: control-plane-operator-v4-22 +spec: + project: crt-redhat-acm-tenant + template: + name: hypershift-cpo-template + values: + - name: version + value: "4.22"