Skip to content

OCPBUGS-86238: add CPO overrides for ARO swift-nic resource limits #8610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
celebdor merged 2 commits into from
May 29, 2026
+99 −17
Merged

OCPBUGS-86238: add CPO overrides for ARO swift-nic resource limits #8610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46f3b35
fix(hypershift-operator): add CPO overrides for ARO swift-nic resourc…
celebdor May 27, 2026
60d9fe4
chore(contrib): add Konflux PDS definitions for CPO 4.21 and 4.22
celebdor May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions contrib/konflux/cpo_4_21_stream.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
11 changes: 11 additions & 0 deletions contrib/konflux/cpo_4_22_stream.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
94 changes: 77 additions & 17 deletions hypershift-operator/controlplaneoperator-overrides/assets/overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading