OCPCRT-450: Improve ClusterBot's cloud platform dispursment#604
OCPCRT-450: Improve ClusterBot's cloud platform dispursment#604thiagoalessio wants to merge 5 commits into
Conversation
|
@thiagoalessio: This pull request references OCPCRT-450 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.22.0" version, but no target version was set. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
openshift-ci-robot
added
the
jira/valid-reference
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Enterprise Run ID: 📒 Files selected for processing (4)
🚧 Files skipped from review as they are similar to previous changes (4)
📝 WalkthroughWalkthroughThis PR adds a CloudAccountProfile type and platformQuotaSlices, implements selectCloudAccountProfile that chooses an alternate account by Boskos metrics, sets job.CloudAccountProfile in LaunchJobForUser, applies cluster profiles in newJob via applyClusterProfile, and adds tests for selection logic. ChangesQuota-slice selection and application
Estimated code review effort🎯 4 (Complex) | ⏱️ ~45 minutes
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Warning There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure. 🔧 golangci-lint (2.12.2)Command failed Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
pkg/manager/prow.go (1)
1732-1734:⚠️ Potential issue | 🟠 MajorInitialize
Environmentbefore settingBASE_DOMAIN.Many
launchconfigs have noenvironment:block. When that happens, Lines 1732-1734 silently drop the alternate-domain override, soaws-2/azure-2jobs still use the default base domain.Suggested fix
- if accountDomain != "" && matchedTarget.MultiStageTestConfiguration != nil && matchedTarget.MultiStageTestConfiguration.Environment != nil { - matchedTarget.MultiStageTestConfiguration.Environment["BASE_DOMAIN"] = accountDomain - } + if accountDomain != "" { + if matchedTarget.MultiStageTestConfiguration.Environment == nil { + matchedTarget.MultiStageTestConfiguration.Environment = make(citools.TestEnvironment) + } + matchedTarget.MultiStageTestConfiguration.Environment["BASE_DOMAIN"] = accountDomain + }🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@pkg/manager/prow.go` around lines 1732 - 1734, The code sets matchedTarget.MultiStageTestConfiguration.Environment["BASE_DOMAIN"] without ensuring Environment is initialized; modify the block that checks accountDomain and matchedTarget.MultiStageTestConfiguration (the lines manipulating matchedTarget.MultiStageTestConfiguration.Environment) to allocate a new map if Environment is nil (e.g., set matchedTarget.MultiStageTestConfiguration.Environment = make(map[string]string)) before assigning the "BASE_DOMAIN" key so alternate-domain overrides are applied even when no environment: block exists in the launch config.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@pkg/manager/manager.go`:
- Around line 154-156: The current code returns an error when
lClient.Metrics(accounts[i].QuotaSlice) fails, which aborts scheduling; change
this to log the error and fall back to using the primary/default account instead
of returning nil. Specifically, in the block that calls lClient.Metrics for
accounts[i].QuotaSlice, catch the error, emit a warning (including the error)
and set metrics to the primary account's metrics (or mark this candidate as
using the primary quota) so the caller can continue; do this change around the
lClient.Metrics call and its error handling to avoid returning fmt.Errorf and
instead continue with a fallback metrics value.
---
Outside diff comments:
In `@pkg/manager/prow.go`:
- Around line 1732-1734: The code sets
matchedTarget.MultiStageTestConfiguration.Environment["BASE_DOMAIN"] without
ensuring Environment is initialized; modify the block that checks accountDomain
and matchedTarget.MultiStageTestConfiguration (the lines manipulating
matchedTarget.MultiStageTestConfiguration.Environment) to allocate a new map if
Environment is nil (e.g., set
matchedTarget.MultiStageTestConfiguration.Environment = make(map[string]string))
before assigning the "BASE_DOMAIN" key so alternate-domain overrides are applied
even when no environment: block exists in the launch config.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: 0abbf168-63b8-4399-859d-1a757db3749a
📒 Files selected for processing (4)
pkg/manager/manager.gopkg/manager/manager_test.gopkg/manager/prow.gopkg/manager/types.go
|
/label tide/merge-method-squash |
openshift-ci
Bot
added
the
tide/merge-method-squash
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: bradmwilliams, thiagoalessio The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
Bot
added
the
approved
Renaming this function to better reflect its purpose, especially if at some point we have more than two accounts. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Introduce the data structures that will replace the hardcoded switch block for quota-slice selection. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Extract the quota-slice selection logic into a standalone function that loops over platformQuotaSlices entries, queries Boskos metrics for each, and returns the profile with the most free resources. The old switch block still exists for now. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…ction Got rid of the switch block in favor of the newly introduced `selectCloudAccountProfile`. Also replaced the other switch block with those wrapper functions in `prow.go` with a single nil check that calls applyClusterProfile directly from the profile struct fields. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…ailable Instead of failing the cluster launch when Boskos metrics cannot be retrieved, log a warning and proceed with the default (primary) account. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
|
@thiagoalessio: This pull request references OCPCRT-450 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "5.0.0" version, but no target version was set. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
|
@thiagoalessio: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
|
/jira refresh |
|
@thiagoalessio: This pull request references OCPCRT-450 which is a valid jira issue. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
3 participants
Previously, selecting which cloud account to use for a platform (e.g. aws vs aws-2) required maintaining two nearly identical switch blocks: one in
manager.goto query Boskos metrics and pick the best account, and another inprow.goto apply the corresponding cluster profile to the ProwJob. Adding or removing a cloud account meant editing both switches and adding/removing wrapper functions.Now, all account information lives in a single
platformQuotaSlicesmap. A genericselectCloudAccountProfilefunction loops over entries, queries Boskos, and picks the one with the most free resources. The result is passed directly toapplyClusterProfile.Why the quota-slice names are still listed explicitly
Ideally, I wish we could dynamically discover available quota-slice resource types from Boskos, but both Claude and I couldn't find something that would allow us to fetch a list of resources in https://github.com/kubernetes-sigs/boskos/blob/master/client/client.go.
This could have been refactored even further, extracting these values to a config file or something, but it is already better than before, so after these changes, adding a third AWS account for example can be done by simply by appending a new entry in
platformQuotaSlices.Suggestion on how to review
I'd recommend to check the individual commits, I tried to make each one small and self-contained, each advancing one refactoring step towards the end goal.
Summary by CodeRabbit
New Features
Refactor