OTA-1546: Reconcile cv.spec.desiredUpdate.acceptRisks #1284
Conversation
openshift-ci-robot
added
the
jira/valid-reference
|
@hongkailiu: This pull request references OTA-1546 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 story 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. |
WalkthroughAdds feature-gated support for accepting conditional-update risks: new feature-gate wiring and operator gate method, acceptance state and per-risk condition tracking on availableUpdates, propagation into evaluation, status, and metrics paths, new internal constants, go.mod replace directives, and corresponding tests. Changes
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~25 minutes ✨ Finishing touches
Comment |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: hongkailiu 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
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 4
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
pkg/cvo/availableupdates.go (1)
521-579: Fix the risk condition storage logic to accumulate all conditions instead of silently dropping duplicates.The code at lines 570–571 only stores a risk condition if the risk name hasn't been seen before, causing silent data loss when multiple ConditionalUpdates contain risks with the same name. Since
evaluateConditionalUpdateis called once per ConditionalUpdate with a sharedriskConditionsmap (line 444), conditions for the same risk name across different updates are overwritten or ignored.Additionally, the
TestEvaluateConditionalUpdatetest callsevaluateConditionalUpdatewith 3 arguments, but the function signature requires 6 (acceptRisks, shouldReconcileAcceptRisks, riskConditions). The test needs to be updated to match the current function signature and verify the riskConditions map is populated correctly.
📜 Review details
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Cache: Disabled due to data retention organization setting
Knowledge base: Disabled due to Reviews -> Disable Knowledge Base setting
⛔ Files ignored due to path filters (35)
go.sumis excluded by!**/*.sumvendor/github.com/openshift/api/config/v1/register.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/types_cluster_version.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/types_feature.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/types_image_policy.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/types_insights.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/types_scheduling.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-CustomNoUpgrade.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-Default.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-DevPreviewNoUpgrade.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-OKD.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-TechPreviewNoUpgrade.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_apiservers-OKD.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_clusterimagepolicies-Default.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_clusterimagepolicies-DevPreviewNoUpgrade.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_clusterimagepolicies-TechPreviewNoUpgrade.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_clusterimagepolicies.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_featuregates.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_imagepolicies-Default.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_imagepolicies-DevPreviewNoUpgrade.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_imagepolicies-TechPreviewNoUpgrade.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_imagepolicies.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-OKD.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_insightsdatagathers-CustomNoUpgrade.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_insightsdatagathers-DevPreviewNoUpgrade.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_insightsdatagathers-TechPreviewNoUpgrade.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_nodes-OKD.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_schedulers-SelfManagedHA-DevPreviewNoUpgrade.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_schedulers-SelfManagedHA-OKD.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_schedulers-SelfManagedHA-TechPreviewNoUpgrade.crd.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.featuregated-crd-manifests.yamlis excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/features/features.gois excluded by!vendor/**,!**/vendor/**vendor/modules.txtis excluded by!vendor/**,!**/vendor/**
📒 Files selected for processing (7)
go.modpkg/cvo/availableupdates.gopkg/cvo/cvo.gopkg/cvo/status.gopkg/featuregates/featuregates.gopkg/internal/constants.gopkg/payload/precondition/clusterversion/recommendedupdate.go
🧰 Additional context used
📓 Path-based instructions (1)
**
⚙️ CodeRabbit configuration file
-Focus on major issues impacting performance, readability, maintainability and security. Avoid nitpicks and avoid verbosity.
Files:
pkg/payload/precondition/clusterversion/recommendedupdate.gopkg/internal/constants.gopkg/cvo/cvo.gopkg/featuregates/featuregates.gogo.modpkg/cvo/status.gopkg/cvo/availableupdates.go
🧬 Code graph analysis (3)
pkg/payload/precondition/clusterversion/recommendedupdate.go (1)
pkg/internal/constants.go (1)
ConditionalUpdateConditionTypeRecommended(76-76)
pkg/cvo/status.go (2)
pkg/internal/constants.go (1)
ConditionalUpdateConditionTypeRecommended(76-76)pkg/featuregates/featuregates.go (1)
CvoGateChecker(19-41)
pkg/cvo/availableupdates.go (2)
pkg/clusterconditions/clusterconditions.go (2)
Condition(19-29)ConditionRegistry(31-42)pkg/internal/constants.go (2)
ConditionalUpdateConditionTypeRecommended(76-76)ConditionalUpdateRiskConditionTypeApplies(80-80)
🔇 Additional comments (10)
pkg/payload/precondition/clusterversion/recommendedupdate.go (1)
14-15: LGTM!Good refactor to use the centralized constant
internal.ConditionalUpdateConditionTypeRecommendedinstead of a hardcoded string. This improves maintainability and consistency across the codebase.Also applies to: 55-55
pkg/cvo/cvo.go (1)
1094-1102: LGTM!The new
shouldReconcileAcceptRisks()method follows the same pattern asshouldReconcileCVOConfiguration()and correctly gates the functionality behind theAcceptRisksfeature gate while excluding HyperShift environments.pkg/cvo/availableupdates.go (1)
177-207: LGTM on struct additions.The new fields
ShouldReconcileAcceptRisks,AcceptRisks, andRiskConditionsare well-placed in the struct and align with the risk acceptance feature requirements.pkg/featuregates/featuregates.go (2)
38-41: LGTM!The
AcceptRisksfeature gate is properly added following the established pattern for other CVO feature gates (StatusReleaseArchitecture,CVOConfiguration).Also applies to: 55-56, 70-72
103-104: VerifyFeatureGateClusterUpdateAcceptRisksis exported by the features package.The code references
features.FeatureGateClusterUpdateAcceptRisksimported fromgithub.com/openshift/api/features. While this constant is not defined locally and cannot be verified within this repository, the go.mod uses a forked version (hongkailiu/api). Ensure this constant exists in the forked API package and will remain available when migrating to the officialopenshift/apipackage.Also applies to: 113-114
pkg/cvo/status.go (3)
40-41: LGTM!Good refactor to use the centralized constant for condition type lookup.
191-199: LGTM on signature change.The extended signature properly accepts the
shouldReconcileAcceptRiskscallback to gate the risk reconciliation behavior.
452-465: LGTM onconditionalUpdateRiskshelper.The function correctly deduplicates risks by name and returns a flat list of unique
ConditionalUpdateRiskentries.pkg/internal/constants.go (1)
73-81: LGTM!Well-documented constants that centralize condition type identifiers. Both constants are appropriately named, follow existing patterns in this file, and are actively used throughout the codebase.
go.mod (1)
97-97: Personal fork replacement should not be merged.This
replacedirective points to a personal fork (github.com/hongkailiu/api) instead of the officialgithub.com/openshift/api. Per the commit message "to-be-replaced by api#2360", this should be updated to the official repository once the upstream PR is merged before this change can be merged to main.
There was a problem hiding this comment.
Actionable comments posted: 2
♻️ Duplicate comments (1)
pkg/cvo/status.go (1)
425-454: Add nil check forgetAvailableUpdates()at line 428.Line 428 directly accesses
getAvailableUpdates().RiskConditions, but the function signature indicatesgetAvailableUpdatescan returnnil. This would cause a panic. ThemergeReleaseMetadatafunction at line 227 safely checks for nil (cvo.go:909), butconditionalUpdateWithRiskNamesAndRiskConditionsdoes not.Suggested fix
func conditionalUpdateWithRiskNamesAndRiskConditions(conditionalUpdates []configv1.ConditionalUpdate, getAvailableUpdates func() *availableUpdates, desiredImage string) ([]configv1.ConditionalUpdate, []string) { var result []configv1.ConditionalUpdate var riskNamesForDesiredImage []string - riskConditions := getAvailableUpdates().RiskConditions + var riskConditions map[string][]metav1.Condition + if au := getAvailableUpdates(); au != nil { + riskConditions = au.RiskConditions + } for _, conditionalUpdate := range conditionalUpdates {
🧹 Nitpick comments (1)
pkg/cvo/status.go (1)
429-454: Review risk condition synchronization logic.Lines 433-450 implement risk condition synchronization with the following flow:
- Build a set of risk names from
conditionalUpdate.Risks- Remove stale conditions (not in fetched
riskConditions)- Merge in new conditions from
riskConditionsHowever, there's a subtle logic concern at lines 436-445:
for _, condition := range risk.Conditions { if found := meta.FindStatusCondition(conditions, condition.Type); found == nil { riskTypesToRemove.Insert(condition.Type) } }This removes condition types from
risk.Conditionsif they're not found inriskConditions[risk.Name]. Then at lines 446-448:for _, condition := range conditions { meta.SetStatusCondition(&risk.Conditions, condition) }New conditions are added. This is correct if the intent is to replace conditions on each risk with only those from
riskConditions. Please confirm this is the intended behavior.💡 Consider adding clarifying comments
The synchronization logic would benefit from comments explaining the intent:
riskNames := sets.New[string]() for _, risk := range conditionalUpdate.Risks { riskNames.Insert(risk.Name) + // Remove stale condition types that are no longer present in the fetched risk conditions riskTypesToRemove := sets.New[string]() conditions := riskConditions[risk.Name] for _, condition := range risk.Conditions { if found := meta.FindStatusCondition(conditions, condition.Type); found == nil { riskTypesToRemove.Insert(condition.Type) } } for riskTypeToRemove := range riskTypesToRemove { meta.RemoveStatusCondition(&risk.Conditions, riskTypeToRemove) } + // Merge in current conditions from the risk conditions map for _, condition := range conditions { meta.SetStatusCondition(&risk.Conditions, condition) } }
📜 Review details
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Cache: Disabled due to data retention organization setting
Knowledge base: Disabled due to Reviews -> Disable Knowledge Base setting
⛔ Files ignored due to path filters (23)
go.sumis excluded by!**/*.sumvendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/custom.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/gatherconfig.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/gathererconfig.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/gatherers.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/insightsdatagather.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/insightsdatagatherspec.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/persistentvolumeclaimreference.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/persistentvolumeconfig.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/storage.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/client-go/config/applyconfigurations/internal/internal.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/client-go/config/applyconfigurations/utils.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/config_client.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/fake/fake_config_client.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/fake/fake_insightsdatagather.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/generated_expansion.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/insightsdatagather.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/client-go/config/informers/externalversions/config/v1/insightsdatagather.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/client-go/config/informers/externalversions/config/v1/interface.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/client-go/config/informers/externalversions/generic.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/client-go/config/listers/config/v1/expansion_generated.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/client-go/config/listers/config/v1/insightsdatagather.gois excluded by!vendor/**,!**/vendor/**vendor/modules.txtis excluded by!vendor/**,!**/vendor/**
📒 Files selected for processing (11)
go.modpkg/cvo/availableupdates.gopkg/cvo/availableupdates_test.gopkg/cvo/cvo.gopkg/cvo/metrics.gopkg/cvo/metrics_test.gopkg/cvo/status.gopkg/cvo/status_test.gopkg/featuregates/featuregates.gopkg/internal/constants.gopkg/payload/precondition/clusterversion/recommendedupdate.go
🚧 Files skipped from review as they are similar to previous changes (2)
- pkg/cvo/cvo.go
- pkg/internal/constants.go
🧰 Additional context used
📓 Path-based instructions (1)
**
⚙️ CodeRabbit configuration file
-Focus on major issues impacting performance, readability, maintainability and security. Avoid nitpicks and avoid verbosity.
Files:
go.modpkg/cvo/metrics_test.gopkg/cvo/status_test.gopkg/payload/precondition/clusterversion/recommendedupdate.gopkg/cvo/status.gopkg/cvo/metrics.gopkg/featuregates/featuregates.gopkg/cvo/availableupdates.gopkg/cvo/availableupdates_test.go
🧬 Code graph analysis (5)
pkg/cvo/metrics_test.go (2)
pkg/cvo/status.go (1)
ConditionalUpdateConditionTypeRecommended(35-35)pkg/internal/constants.go (1)
ConditionalUpdateConditionTypeRecommended(76-76)
pkg/payload/precondition/clusterversion/recommendedupdate.go (2)
pkg/cvo/status.go (1)
ConditionalUpdateConditionTypeRecommended(35-35)pkg/internal/constants.go (1)
ConditionalUpdateConditionTypeRecommended(76-76)
pkg/cvo/status.go (1)
pkg/featuregates/featuregates.go (1)
CvoGateChecker(19-41)
pkg/cvo/metrics.go (2)
pkg/cvo/status.go (1)
ConditionalUpdateConditionTypeRecommended(35-35)pkg/internal/constants.go (1)
ConditionalUpdateConditionTypeRecommended(76-76)
pkg/cvo/availableupdates_test.go (2)
pkg/featuregates/featuregates.go (1)
DefaultCvoGates(75-83)pkg/cvo/cvo.go (1)
New(204-296)
🔇 Additional comments (30)
go.mod (1)
13-13: Clarify the relationship and necessity of replace directives.Line 13 requires
github.com/openshift/apiat version20251222154221, but line 97 replaces it with a fork at version20251223025917. Line 99 replacesopenshift/client-gowith itself at a different version.Provide inline comments explaining:
- Why the fork in line 97 is necessary instead of using the upstream version pinned in line 13.
- Why line 99 replaces the module with itself but at a different timestamp, and whether this indicates a transitive dependency resolution issue that should be addressed differently.
- Whether these replaces are expected to be temporary or permanent, and if temporary, the plan to remove them before release.
Also applies to: 97-97, 99-99
pkg/payload/precondition/clusterversion/recommendedupdate.go (1)
14-14: LGTM! Constant centralization improves maintainability.The refactoring to use
internal.ConditionalUpdateConditionTypeRecommendedinstead of the string literal"Recommended"reduces duplication and the risk of typos across the codebase.Also applies to: 55-55
pkg/featuregates/featuregates.go (1)
39-40: LGTM! Feature gate implementation follows established patterns.The AcceptRisks feature gate is properly wired through the entire chain:
- Interface method declared
- Struct field added with conservative default (false)
- Getter method implemented
- Proper handling in both enable and disable paths
The implementation is consistent with existing feature gates (StatusReleaseArchitecture, CVOConfiguration).
Also applies to: 55-55, 70-72, 81-81, 103-104, 113-114
pkg/cvo/metrics_test.go (1)
50-50: LGTM! Test updated to use centralized constant.The change to use
internal.ConditionalUpdateConditionTypeRecommendedis consistent with the constant centralization across the codebase.pkg/cvo/metrics.go (1)
444-444: LGTM! Metrics collection updated to use centralized constant.The change to use
internal.ConditionalUpdateConditionTypeRecommendedmaintains the same filtering logic while aligning with the codebase-wide constant centralization.pkg/cvo/status_test.go (1)
206-206: LGTM! Test infrastructure updated for new feature gate.The changes properly update the test fakes and function calls:
fakeRiFlagsnow implements the completeCvoGateCheckerinterface with the newAcceptRisks()method- The
updateClusterVersionStatuscall includes the newshouldReconcileAcceptRiskscallback with a conservative default (false) appropriate for this test's focus on error filteringAlso applies to: 221-223, 749-751
pkg/cvo/status.go (6)
20-20: LGTM! Import addition is appropriate.The
setsimport is correctly added to support the new risk acceptance functionality.
44-44: LGTM! Constant usage centralized.The switch to
internal.ConditionalUpdateConditionTypeRecommendedaligns with the PR's objective of using centralized internal constants.
195-203: LGTM! Function signature properly extended.The addition of
shouldReconcileAcceptRisks func() boolparameter is appropriate for feature-gating the risk acceptance logic, and the call site at line 184 correctly passesoptr.shouldReconcileAcceptRisks.
232-236: LGTM! Risk processing logic is properly gated.The risk-aware processing integration correctly:
- Gates execution with
shouldReconcileAcceptRisks()- Computes
riskNamesForDesiredImagefor the desired image- Updates
ConditionalUpdatesandConditionalUpdateRisksfields
241-247: LGTM! Risk message construction logic is correct.The conditional message appending properly handles both scenarios:
- Empty
risksMsg: constructs a complete sentence- Non-empty
risksMsg: appends with appropriate separatorThe logic is correctly gated by both
shouldReconcileAcceptRisks()and the presence ofriskNamesForDesiredImage.
456-469: LGTM! Risk deduplication logic is correct.The
conditionalUpdateRisksfunction correctly deduplicates risks across all conditional updates using a set-based approach, ensuring each unique risk appears only once in the returned slice.pkg/cvo/availableupdates_test.go (7)
22-22: LGTM! Import additions support new test functionality.The
setsimport is appropriately added to support the newAcceptRisksfield handling in tests.
29-29: LGTM! Feature gates import is appropriate.The
featuregatesimport enables test setup to configureenabledFeatureGates, which is essential for testing the new gated behavior.
211-212: LGTM! Comparison option correctly ignores function field.Adding
ShouldReconcileAcceptRisksto the ignore list is appropriate since function pointers cannot be meaningfully compared in deep equality checks.
237-237: LGTM! Feature gates properly initialized in tests.The test correctly initializes
enabledFeatureGateswithDefaultCvoGatesbefore invokingsyncAvailableUpdates, ensuring the code under test has access to gate-checking functionality.
515-517: LGTM! Test call signature correctly updated.The
evaluateConditionalUpdatecall is properly updated with the new parameters:
sets.New[string]()for empty accepted risksfunc() bool { return false }to disable risk acceptancemap[string][]metav1.Condition{}for empty risk conditionsThese defaults are appropriate for testing the core evaluation logic in isolation.
326-326: LGTM! Consistent feature gate initialization.The test setup consistently initializes feature gates before each sync operation.
754-754: LGTM! Feature gate initialization is consistent.All test cases consistently initialize
enabledFeatureGatesbefore calling sync methods, ensuring uniform test behavior.pkg/cvo/availableupdates.go (11)
19-19: LGTM! Import addition is appropriate.The
setsimport correctly supports the newAcceptRisksfield of typesets.Set[string].
26-26: LGTM! Internal constants import is appropriate.The
internalpackage import provides access to centralized constants likeConditionalUpdateConditionTypeRecommended, aligning with the PR's objective of using internal constants.
55-60: LGTM! Nil-safety properly implemented.The
acceptRisksinitialization correctly guards against a nilDesiredUpdateby checkingconfig.Spec.DesiredUpdate != nilbefore accessing itsAcceptRisksfield. This addresses the previously flagged nil pointer concern.
140-141: LGTM! AvailableUpdates fields properly initialized.The
ShouldReconcileAcceptRisksandAcceptRisksfields are correctly assigned from operator state, enabling risk acceptance logic during update evaluation.
183-184: LGTM! Struct fields appropriately added.The new fields
ShouldReconcileAcceptRisks(gate function) andAcceptRisks(risk name set) are correctly typed and positioned to support the risk acceptance feature.
208-208: LGTM! RiskConditions field appropriately added.The
RiskConditionsmap field enables per-risk condition tracking, mapping risk names to their associated conditions.
307-312: LGTM with observation: RiskConditions not copied.The new fields are correctly populated in the copy:
- Line 311:
ShouldReconcileAcceptRisksuses the current operator method (ensuring latest gate state)- Line 312:
AcceptRisksis copied from stored stateObservation:
RiskConditionsis not copied here and remains nil in the returned struct. This appears intentional sinceRiskConditionsis populated duringevaluateConditionalUpdates. Verify this is the expected behavior.
446-446: LGTM! Function call correctly updated.The
evaluateConditionalUpdatecall properly passes the new parameters (u.AcceptRisks,u.ShouldReconcileAcceptRisks,u.RiskConditions) to support risk acceptance evaluation.
505-505: LGTM! Constant appropriately added.The
riskConditionReasonEvaluationFailedconstant provides a consistent reason value for risk condition evaluation failures.
523-530: LGTM! Function signature appropriately extended.The
evaluateConditionalUpdatesignature is correctly extended with:
acceptRisks sets.Set[string]: accepted risk namesshouldReconcileAcceptRisks func() bool: feature gate checkriskConditions map[string][]metav1.Condition: per-risk condition trackingAll call sites have been updated accordingly.
532-532: LGTM! Constant usage centralized.The switch to
internal.ConditionalUpdateConditionTypeRecommendedaligns with the PR's objective of using internal constants consistently.
|
|
||
| replace github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 | ||
|
|
||
| replace github.com/openshift/api => github.com/hongkailiu/api v0.0.0-20251223025917-1321bde686ff |
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
cat -n go.mod | sed -n '1,110p'Repository: openshift/cluster-version-operator
Length of output: 5226
🏁 Script executed:
# Search for comments related to hongkailiu or acceptRisks (mentioned in original comment)
rg -i "hongkailiu|acceptRisks|accept.risk" --type go --type md -B 2 -A 2Repository: openshift/cluster-version-operator
Length of output: 8135
🏁 Script executed:
# Check what types from openshift/api are being imported
rg "from github.com/openshift/api|import.*openshift/api" --type go -A 3 | head -40Repository: openshift/cluster-version-operator
Length of output: 60
🏁 Script executed:
# Search for actual imports from openshift/api package
rg "configv1|appv1|imagev1" --type go | head -20Repository: openshift/cluster-version-operator
Length of output: 2314
🏁 Script executed:
# Check git log for recent changes to go.mod related to openshift/api
git log --oneline -20 go.mod | head -20Repository: openshift/cluster-version-operator
Length of output: 140
🏁 Script executed:
# Check the commit details for go.mod changes
git show cd8eab20 -- go.modRepository: openshift/cluster-version-operator
Length of output: 4955
🏁 Script executed:
# Check what changed in the commit - look at actual code changes (not just go.mod)
git show cd8eab20 --stat | head -30Repository: openshift/cluster-version-operator
Length of output: 1769
🏁 Script executed:
# Check the full commit message and any PR details
git show cd8eab20 --format=fuller | head -50Repository: openshift/cluster-version-operator
Length of output: 2089
🏁 Script executed:
# Check if there are any comments or documentation about the fork in the repo
rg -i "fork|hongkailiu" --type md -B 2 -A 2Repository: openshift/cluster-version-operator
Length of output: 858
🏁 Script executed:
# Check if there's any PR description or related documentation about why the fork is needed
ls -la | grep -E "PULL_REQUEST|PR_|ISSUE"Repository: openshift/cluster-version-operator
Length of output: 60
🏁 Script executed:
# Check the most recent changes to understand if this is a new repository initialization
git log --oneline --all | tail -10Repository: openshift/cluster-version-operator
Length of output: 532
🏁 Script executed:
# Check if the fork repository exists and is accessible - search for any references to what changed in hongkailiu/api
rg "github.com/hongkailiu" . --type go --type md -B 1 -A 1Repository: openshift/cluster-version-operator
Length of output: 60
🏁 Script executed:
# Check what specific types/interfaces are being used from openshift/api related to acceptRisks
rg "ConditionalUpdateRisk|AcceptRisks|ConditionalUpdate" --type go -B 1 -A 1 | head -40Repository: openshift/cluster-version-operator
Length of output: 2535
🏁 Script executed:
# Check the exact types from configv1 that are used in the code
rg "desiredUpdate.AcceptRisks|spec.DesiredUpdate.AcceptRisks" --type go -B 2 -A 2Repository: openshift/cluster-version-operator
Length of output: 60
🏁 Script executed:
# Check what types are imported and used from openshift/api
grep -r "DesiredUpdate\|ConditionalUpdateRisk\|AcceptRisks" pkg/ --include="*.go" | head -20Repository: openshift/cluster-version-operator
Length of output: 1955
🏁 Script executed:
# Check what specific fields from configv1.Update are being accessed (particularly AcceptRisks)
rg "\.AcceptRisks|configv1\.Update" --type go -B 2 -A 2 | head -50Repository: openshift/cluster-version-operator
Length of output: 3656
Replace directive must be removed or documented before merge—uses personal fork instead of upstream dependency.
The replace directive at line 97 redirects github.com/openshift/api to a personal fork (hongkailiu/api). This creates supply chain and availability risks:
- Personal forks can be deleted, abandoned, or compromised, breaking builds and potentially introducing malicious changes.
- CI/CD systems with restricted network access (air-gapped builds, corporate firewalls) cannot pull from personal repositories.
- Unsustainable for production dependencies.
The code actively uses configv1 types from openshift/api (e.g., ConditionalUpdateRisk, Update, AcceptRisks fields). Before this PR merges:
- If temporary (development only): Remove the replace directive before merge.
- If required: Contribute missing features/types to canonical
openshift/apiand update this dependency to use the upstream version. Document the blocker (e.g., GitHub issue reference). - If transitive compatibility fix: Add a comment in go.mod explaining the reasoning.
🤖 Prompt for AI Agents
In go.mod around line 97, the replace directive redirects
github.com/openshift/api to a personal fork (hongkailiu/api) which must not be
left in the merge; either remove the replace before merging if it was only for
local/dev testing, or if the forked changes are required: open a public issue/PR
against the canonical github.com/openshift/api to get the needed types merged,
update the go.mod to require the upstream module version that contains those
changes (and remove the personal replace), or if this is an unavoidable
temporary transitive compatibility workaround, add a clear comment immediately
above the replace in go.mod documenting why the fork is used, link to the
blocker issue/PR, and include a TODO to remove it once upstream is updated so CI
and supply-chain concerns are visible.
There was a problem hiding this comment.
Actionable comments posted: 0
♻️ Duplicate comments (1)
pkg/cvo/availableupdates.go (1)
572-574: Risk conditions may not persist across evaluations and could contain stale data.Two issues with the risk condition tracking:
Map nil panic (duplicate concern from past review): If
riskConditionsis nil when line 573 executes, it will panic. This can occur whenneedFreshFetchis false and the cachedRiskConditionsis nil (e.g., from an older state before line 142 was added, or if the map reference from line 314 is nil).Stale conditions on re-evaluation: The check
if _, ok := riskConditions[risk.Name]; !okmeans existing conditions are never updated. WhenevaluateConditionalUpdatesis called multiple times (e.g., whenneedFreshFetchis false but conditions need re-evaluation per lines 86-104), the risk conditions remain unchanged from the previous evaluation, potentially leaving stale status/reason/message.🔎 Recommended fixes
Fix 1: Initialize map before use
In
evaluateConditionalUpdatesbefore the loop (after line 446):}) for i, conditionalUpdate := range u.ConditionalUpdates { + if u.RiskConditions == nil { + u.RiskConditions = map[string][]metav1.Condition{} + } condition := evaluateConditionalUpdate(ctx, conditionalUpdate.Risks, u.ConditionRegistry, u.AcceptRisks, u.ShouldReconcileAcceptRisks, u.RiskConditions)Fix 2: Update conditions on re-evaluation
Replace the conditional assignment with unconditional:
- if _, ok := riskConditions[risk.Name]; !ok { - riskConditions[risk.Name] = []metav1.Condition{riskCondition} - } + riskConditions[risk.Name] = []metav1.Condition{riskCondition}This ensures the condition is updated on every evaluation, reflecting current state rather than preserving stale data.
🧹 Nitpick comments (1)
pkg/cvo/status.go (1)
425-476: Consider skipping risk-condition reconciliation whengetAvailableUpdates()is nilWhen
shouldReconcileAcceptRisks()is true butgetAvailableUpdates()returns nil,conditionalUpdateWithRiskNamesAndRiskConditionstreatsriskConditionsas empty and will remove all existingrisk.ConditionsfromcvStatus.ConditionalUpdatesbefore re‑adding none. If CVO restarts with preexisting conditional updates in status but has not yet refreshed in‑memoryavailableUpdates, this could transiently clear risk condition details in status. You may want to early‑return the originalconditionalUpdatesunchanged whenupdates == nilto preserve prior conditions until fresh data is available.
📜 Review details
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Cache: Disabled due to data retention organization setting
Knowledge base: Disabled due to Reviews -> Disable Knowledge Base setting
📒 Files selected for processing (11)
pkg/cvo/availableupdates.gopkg/cvo/availableupdates_test.gopkg/cvo/cvo.gopkg/cvo/cvo_test.gopkg/cvo/metrics.gopkg/cvo/metrics_test.gopkg/cvo/status.gopkg/cvo/status_test.gopkg/featuregates/featuregates.gopkg/internal/constants.gopkg/payload/precondition/clusterversion/recommendedupdate.go
🚧 Files skipped from review as they are similar to previous changes (5)
- pkg/payload/precondition/clusterversion/recommendedupdate.go
- pkg/internal/constants.go
- pkg/cvo/metrics.go
- pkg/cvo/metrics_test.go
- pkg/cvo/status_test.go
🧰 Additional context used
📓 Path-based instructions (1)
**
⚙️ CodeRabbit configuration file
-Focus on major issues impacting performance, readability, maintainability and security. Avoid nitpicks and avoid verbosity.
Files:
pkg/cvo/cvo.gopkg/cvo/status.gopkg/featuregates/featuregates.gopkg/cvo/availableupdates.gopkg/cvo/cvo_test.gopkg/cvo/availableupdates_test.go
🧬 Code graph analysis (1)
pkg/cvo/availableupdates_test.go (3)
pkg/clusterconditions/clusterconditions.go (1)
Condition(19-29)pkg/featuregates/featuregates.go (1)
DefaultCvoGates(75-83)pkg/clusterconditions/mock/mock.go (2)
Mock(35-44)MatchResult(14-20)
🔇 Additional comments (11)
pkg/cvo/cvo.go (1)
1095-1102: AcceptRisks reconciliation gate mirrors existing configuration gating correctlyThe new
shouldReconcileAcceptRiskshelper cleanly reuses the feature‑gate plus!hypershiftpattern fromshouldReconcileCVOConfiguration, giving a clear single decision point for risk‑related reconciliation. Looks good.pkg/featuregates/featuregates.go (1)
39-41: AcceptRisks feature gate wiring is consistent with existing gatesThe
AcceptRisksflag is correctly plumbed through theCvoGateCheckerinterface,CvoGatesstruct, defaults, andCvoGatesFromFeatureGateenable/disable logic, mirroring the existing gate patterns. Only caveat is that adding a method toCvoGateCheckeris a compile‑time breaking change for any external implementations, which is fine if this interface is internal to CVO consumers.Also applies to: 55-56, 70-72, 81-82, 99-105, 109-115
pkg/cvo/cvo_test.go (1)
19-20: Test harness updates align cleanly with new AcceptRisks behaviorUsing
cmpopts.IgnoreFields(availableUpdates{}, "ShouldReconcileAcceptRisks")and initializingoptr.enabledFeatureGateswithfeaturegates.DefaultCvoGates("version")keeps existing tests focused on functional behavior while accommodating the new gate. The extendedcheckStatusgeneric to include*configv1.ClusterVersionfits the existing pattern and maintains clarity of assertions.Also applies to: 2279-2280, 2792-2794, 4057-4109
pkg/cvo/status.go (1)
43-45: Risk-acceptance status integration and nil-guarding look correctUsing
internal.ConditionalUpdateConditionTypeRecommendedinfindRecommendedConditionremoves the hard‑coded string, and threadingshouldReconcileAcceptRisksintoupdateClusterVersionStatusgives a single gate for all accept‑risks behavior. The new helpers cleanly recomputeConditionalUpdates, populateConditionalUpdateRisks, and, via the localupdates := getAvailableUpdates()guard, avoid nil dereferences whenavailableUpdatesis not yet initialized. Overall, the risk‑related status updates and messaging are wired coherently around the feature gate.Also applies to: 184-186, 194-203, 232-247, 425-476
pkg/cvo/availableupdates_test.go (1)
22-23: Tests thoroughly cover acceptRisks and risk-condition propagationThe new table-driven cases for
evaluateConditionalUpdateand the expectations onRiskConditionsin the sync tests exercise zero/one/many risks, matches vs. non-matches, evaluation failures, and the “accepted risk” path viaacceptRisks/shouldReconcileAcceptRisks. InitializingenabledFeatureGateswithfeaturegates.DefaultCvoGates("version")and ignoringShouldReconcileAcceptRisksin struct comparisons keeps tests stable while still validating the new behavior.Also applies to: 211-217, 236-239, 352-372, 418-440, 489-547, 579-583, 795-805
pkg/cvo/availableupdates.go (6)
55-60: LGTM! Nil check properly guards against potential panic.The nil check on
config.Spec.DesiredUpdatecorrectly addresses the previous review concern about potential nil pointer dereference.
180-210: LGTM! Struct fields appropriately defined.The new fields integrate well with the existing structure. The function pointer for
ShouldReconcileAcceptRisksallows for dynamic evaluation, and the map-basedRiskConditionsstructure is suitable for per-risk condition tracking.
499-509: LGTM! Constants are well-defined.The new constants appropriately capture the risk acceptance semantics and evaluation failure states.
517-523: LGTM! Reason merging logic handles acceptance states.The updated logic correctly handles the new
recommendedReasonExposedOnlyToAcceptedRisksstate, though the conditions are complex. The logic prioritizes maintaining "accepted risks only" status when appropriate.
558-570: LGTM! Risk acceptance logic correctly implemented.The conditional logic properly handles accepted risks:
- Risks are only considered "accepted" when both the feature gate (
shouldReconcileAcceptRisks()) is enabled AND the risk appears inacceptRisks- Accepted risks don't block recommendations (line 559)
- Non-accepted but exposed risks do block recommendations (line 563)
This correctly implements the risk acceptance feature semantics.
313-314: This review comment is incorrect and should be dismissed.Lines 313-314 safely shallow-copy
AcceptRisksandRiskConditions. The concern about shared map mutations is unfounded—these fields are mutated only during the construction phase inevaluateConditionalUpdates()(called at line 158), not aftergetAvailableUpdates()returns a read-only snapshot.The nil panic scenario cannot occur:
RiskConditionsis always initialized to an empty map at line 142 before any use. The intentional shallow-copy pattern (evidenced byConditionRegistryat line 318) reflects the design choice to return snapshots for read access to cached state.Likely an incorrect or invalid review comment.
There was a problem hiding this comment.
Actionable comments posted: 1
📜 Review details
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Cache: Disabled due to data retention organization setting
Knowledge base: Disabled due to Reviews -> Disable Knowledge Base setting
📒 Files selected for processing (11)
pkg/cvo/availableupdates.gopkg/cvo/availableupdates_test.gopkg/cvo/cvo.gopkg/cvo/cvo_test.gopkg/cvo/metrics.gopkg/cvo/metrics_test.gopkg/cvo/status.gopkg/cvo/status_test.gopkg/featuregates/featuregates.gopkg/internal/constants.gopkg/payload/precondition/clusterversion/recommendedupdate.go
🚧 Files skipped from review as they are similar to previous changes (6)
- pkg/payload/precondition/clusterversion/recommendedupdate.go
- pkg/cvo/metrics_test.go
- pkg/cvo/cvo.go
- pkg/cvo/status_test.go
- pkg/cvo/metrics.go
- pkg/internal/constants.go
🧰 Additional context used
📓 Path-based instructions (1)
**
⚙️ CodeRabbit configuration file
-Focus on major issues impacting performance, readability, maintainability and security. Avoid nitpicks and avoid verbosity.
Files:
pkg/featuregates/featuregates.gopkg/cvo/status.gopkg/cvo/availableupdates_test.gopkg/cvo/cvo_test.gopkg/cvo/availableupdates.go
🧬 Code graph analysis (4)
pkg/cvo/status.go (1)
pkg/internal/constants.go (1)
ConditionalUpdateConditionTypeRecommended(76-76)
pkg/cvo/availableupdates_test.go (2)
pkg/featuregates/featuregates.go (1)
DefaultCvoGates(75-83)pkg/cvo/cvo.go (1)
New(204-296)
pkg/cvo/cvo_test.go (1)
pkg/clusterconditions/clusterconditions.go (1)
Condition(19-29)
pkg/cvo/availableupdates.go (2)
pkg/clusterconditions/clusterconditions.go (2)
Condition(19-29)ConditionRegistry(31-42)pkg/internal/constants.go (2)
ConditionalUpdateConditionTypeRecommended(76-76)ConditionalUpdateRiskConditionTypeApplies(80-80)
🔇 Additional comments (5)
pkg/featuregates/featuregates.go (1)
39-40: AcceptRisks feature-gate wiring looks correct and conservativeInterface, struct field, default initialization, and FeatureGate mapping for
FeatureGateClusterUpdateAcceptRisksare all consistent and symmetric; defaulting tofalsein unknown-version mode is appropriately safe.Also applies to: 55-56, 70-72, 81-82, 103-105, 113-115
pkg/cvo/cvo_test.go (1)
19-20: Updated availableUpdates expectations and comparison are soundUsing
cmp.Diffwithcmpopts.IgnoreFields(availableUpdates{}, "ShouldReconcileAcceptRisks")and explicitly assertingRiskConditionsin the test table aligns the tests with the new risk-tracking fields while avoiding brittle comparisons on function fields and timestamps.Also applies to: 2357-2370, 2401-2412, 2445-2455, 2495-2505, 2559-2574, 2627-2641, 2729-2741, 2792-2794
pkg/cvo/availableupdates_test.go (1)
14-16: Tests comprehensively cover new risk-acceptance and RiskConditions behaviorThe additional cmp options, RiskConditions expectations, and extended
TestEvaluateConditionalUpdate/ desired-update tests exercise the new AcceptRisks and per-risk condition flows well, while guarding against nil-map issues and non-deterministic fields.Also applies to: 21-23, 211-217, 219-247, 352-372, 374-417, 418-440, 462-547, 549-571, 579-583, 591-605, 610-782
pkg/cvo/status.go (1)
190-201: Risk-aware status and history updates are gated cleanlyPlumbing
getAvailableUpdatesandshouldReconcileAcceptRisksintoupdateClusterVersionStatus, and only enrichingConditionalUpdates,ConditionalUpdateRisks, andAcceptedRisks/history when the gate is on, keeps existing behavior unchanged while the feature is disabled and localizes the new logic well.Also applies to: 223-232, 234-247
pkg/cvo/availableupdates.go (1)
19-27: AcceptRisks and per-risk condition tracking are wired coherently end-to-endBuilding
acceptRisksfromspec.desiredUpdate.acceptRisks, threading it plusShouldReconcileAcceptRisksandRiskConditionsthroughavailableUpdatesintoevaluateConditionalUpdate, and using internal constants for condition types yields a consistent, feature-gated behavior without introducing nil-map or concurrency hazards at current call sites.Also applies to: 52-60, 136-143, 180-210, 220-259, 298-337, 437-460, 498-509, 526-581
| func conditionalUpdateWithRiskNamesAndRiskConditions(conditionalUpdates []configv1.ConditionalUpdate, getAvailableUpdates func() *availableUpdates, desiredImage string) ([]configv1.ConditionalUpdate, []string) { | ||
| var result []configv1.ConditionalUpdate | ||
| var riskNamesForDesiredImage []string | ||
| var riskConditions map[string][]metav1.Condition | ||
| updates := getAvailableUpdates() | ||
| if updates != nil { | ||
| riskConditions = updates.RiskConditions | ||
| } | ||
| for _, conditionalUpdate := range conditionalUpdates { | ||
| if desiredImage == conditionalUpdate.Release.Image { | ||
| riskNamesForDesiredImage = conditionalUpdate.RiskNames | ||
| } | ||
| riskNames := sets.New[string]() | ||
| for _, risk := range conditionalUpdate.Risks { | ||
| riskNames.Insert(risk.Name) | ||
| riskTypesToRemove := sets.New[string]() | ||
| var conditions []metav1.Condition | ||
| if riskConditions != nil { | ||
| conditions = riskConditions[risk.Name] | ||
| } | ||
| for _, condition := range risk.Conditions { | ||
| if found := meta.FindStatusCondition(conditions, condition.Type); found == nil { | ||
| riskTypesToRemove.Insert(condition.Type) | ||
| } | ||
| } | ||
| for riskTypeToRemove := range riskTypesToRemove { | ||
| meta.RemoveStatusCondition(&risk.Conditions, riskTypeToRemove) | ||
| } | ||
| for _, condition := range conditions { | ||
| meta.SetStatusCondition(&risk.Conditions, condition) | ||
| } | ||
| } | ||
| conditionalUpdate.RiskNames = sets.List[string](riskNames) | ||
| result = append(result, conditionalUpdate) | ||
| } | ||
| return result, riskNamesForDesiredImage | ||
| } |
There was a problem hiding this comment.
Fix ordering bug when capturing riskNamesForDesiredImage
riskNamesForDesiredImage is captured from conditionalUpdate.RiskNames before that slice is recomputed from the current Risks set, so on the first run (or after any change) the names used for message construction can be stale or empty even when risks exist.
Capture riskNamesForDesiredImage after recomputing RiskNames from the riskNames set.
Proposed fix
func conditionalUpdateWithRiskNamesAndRiskConditions(conditionalUpdates []configv1.ConditionalUpdate, getAvailableUpdates func() *availableUpdates, desiredImage string) ([]configv1.ConditionalUpdate, []string) {
var result []configv1.ConditionalUpdate
var riskNamesForDesiredImage []string
@@
- for _, conditionalUpdate := range conditionalUpdates {
- if desiredImage == conditionalUpdate.Release.Image {
- riskNamesForDesiredImage = conditionalUpdate.RiskNames
- }
+ for _, conditionalUpdate := range conditionalUpdates {
riskNames := sets.New[string]()
for _, risk := range conditionalUpdate.Risks {
@@
- }
- conditionalUpdate.RiskNames = sets.List[string](riskNames)
+ }
+ conditionalUpdate.RiskNames = sets.List[string](riskNames)
+ if desiredImage == conditionalUpdate.Release.Image {
+ riskNamesForDesiredImage = conditionalUpdate.RiskNames
+ }
result = append(result, conditionalUpdate)
}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| func conditionalUpdateWithRiskNamesAndRiskConditions(conditionalUpdates []configv1.ConditionalUpdate, getAvailableUpdates func() *availableUpdates, desiredImage string) ([]configv1.ConditionalUpdate, []string) { | |
| var result []configv1.ConditionalUpdate | |
| var riskNamesForDesiredImage []string | |
| var riskConditions map[string][]metav1.Condition | |
| updates := getAvailableUpdates() | |
| if updates != nil { | |
| riskConditions = updates.RiskConditions | |
| } | |
| for _, conditionalUpdate := range conditionalUpdates { | |
| if desiredImage == conditionalUpdate.Release.Image { | |
| riskNamesForDesiredImage = conditionalUpdate.RiskNames | |
| } | |
| riskNames := sets.New[string]() | |
| for _, risk := range conditionalUpdate.Risks { | |
| riskNames.Insert(risk.Name) | |
| riskTypesToRemove := sets.New[string]() | |
| var conditions []metav1.Condition | |
| if riskConditions != nil { | |
| conditions = riskConditions[risk.Name] | |
| } | |
| for _, condition := range risk.Conditions { | |
| if found := meta.FindStatusCondition(conditions, condition.Type); found == nil { | |
| riskTypesToRemove.Insert(condition.Type) | |
| } | |
| } | |
| for riskTypeToRemove := range riskTypesToRemove { | |
| meta.RemoveStatusCondition(&risk.Conditions, riskTypeToRemove) | |
| } | |
| for _, condition := range conditions { | |
| meta.SetStatusCondition(&risk.Conditions, condition) | |
| } | |
| } | |
| conditionalUpdate.RiskNames = sets.List[string](riskNames) | |
| result = append(result, conditionalUpdate) | |
| } | |
| return result, riskNamesForDesiredImage | |
| } | |
| func conditionalUpdateWithRiskNamesAndRiskConditions(conditionalUpdates []configv1.ConditionalUpdate, getAvailableUpdates func() *availableUpdates, desiredImage string) ([]configv1.ConditionalUpdate, []string) { | |
| var result []configv1.ConditionalUpdate | |
| var riskNamesForDesiredImage []string | |
| var riskConditions map[string][]metav1.Condition | |
| updates := getAvailableUpdates() | |
| if updates != nil { | |
| riskConditions = updates.RiskConditions | |
| } | |
| for _, conditionalUpdate := range conditionalUpdates { | |
| riskNames := sets.New[string]() | |
| for _, risk := range conditionalUpdate.Risks { | |
| riskNames.Insert(risk.Name) | |
| riskTypesToRemove := sets.New[string]() | |
| var conditions []metav1.Condition | |
| if riskConditions != nil { | |
| conditions = riskConditions[risk.Name] | |
| } | |
| for _, condition := range risk.Conditions { | |
| if found := meta.FindStatusCondition(conditions, condition.Type); found == nil { | |
| riskTypesToRemove.Insert(condition.Type) | |
| } | |
| } | |
| for riskTypeToRemove := range riskTypesToRemove { | |
| meta.RemoveStatusCondition(&risk.Conditions, riskTypeToRemove) | |
| } | |
| for _, condition := range conditions { | |
| meta.SetStatusCondition(&risk.Conditions, condition) | |
| } | |
| } | |
| conditionalUpdate.RiskNames = sets.List[string](riskNames) | |
| if desiredImage == conditionalUpdate.Release.Image { | |
| riskNamesForDesiredImage = conditionalUpdate.RiskNames | |
| } | |
| result = append(result, conditionalUpdate) | |
| } | |
| return result, riskNamesForDesiredImage | |
| } |
🤖 Prompt for AI Agents
In pkg/cvo/status.go around lines 421 to 457, the code captures
riskNamesForDesiredImage from conditionalUpdate.RiskNames before the function
recomputes conditionalUpdate.RiskNames from the current Risks, which can yield
stale/empty values; to fix, move the assignment that sets
riskNamesForDesiredImage to happen after you build and assign
conditionalUpdate.RiskNames (i.e., after riskNames is converted to a slice and
assigned to conditionalUpdate.RiskNames) so that riskNamesForDesiredImage
reflects the up-to-date names.
2 participants
No description provided.