ROX-31227: Only allow scheduling equivalent tailored profiles#19544
Closed
guzalv wants to merge 9 commits intomaster-base/gualvare/fix-compliance-custom-rules-gotchasfrom
Closed
ROX-31227: Only allow scheduling equivalent tailored profiles#19544guzalv wants to merge 9 commits intomaster-base/gualvare/fix-compliance-custom-rules-gotchasfrom
guzalv wants to merge 9 commits intomaster-base/gualvare/fix-compliance-custom-rules-gotchasfrom
Conversation
…#19540) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Tomasz Janiszewski <tomek@redhat.com> Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
Signed-off-by: Tomasz Janiszewski <tomek@redhat.com> Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com> Co-authored-by: Misha Sugakov <537715+msugakov@users.noreply.github.com>
This commit was mostly generated by Claude Sonnet 4.6, after providing it with a detailed implementation plan which was joint work between human author and Claude Opus 4.6. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
|
Skipping CI for Draft Pull Request. |
Contributor
Author
|
This change is part of the following stack:
Change managed by git-spice. |
Contributor
There was a problem hiding this comment.
Hey - I've found 1 issue, and left some high level feedback:
- There are unresolved merge conflict markers in central/complianceoperator/v2/compliancemanager/manager_impl.go (around validateTailoredProfileHashConsistency and storageToInternalProfileKind); these need to be resolved before merging.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- There are unresolved merge conflict markers in central/complianceoperator/v2/compliancemanager/manager_impl.go (around validateTailoredProfileHashConsistency and storageToInternalProfileKind); these need to be resolved before merging.
## Individual Comments
### Comment 1
<location path="central/complianceoperator/v2/compliancemanager/manager_impl.go" line_range="582-591" />
<code_context>
+<<<<<<< HEAD
</code_context>
<issue_to_address>
**issue (bug_risk):** Resolve leftover merge conflict markers before merging
Unresolved conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`) remain near `validateTailoredProfileHashConsistency` and `storageToInternalProfileKind`. These will break the build and tooling; resolve the conflicts and remove all markers before merging.
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
Comment on lines
+582
to
+591
| <<<<<<< HEAD | ||
| ======= | ||
|
|
||
| // validateTailoredProfileHashConsistency verifies that each tailored profile in the scan | ||
| // request has an equivalent equivalence_hash on every selected cluster. Non-tailored profiles | ||
| // are not checked. Called only when hash checking is not bypassed. | ||
| // | ||
| // Hash equivalence: all instances share the same hash value (COUNT(DISTINCT hash) = 1). | ||
| // All-empty is allowed — treated as equivalent, matching the profile picker semantics. | ||
| func (m *managerImpl) validateTailoredProfileHashConsistency( |
Contributor
There was a problem hiding this comment.
issue (bug_risk): Resolve leftover merge conflict markers before merging
Unresolved conflict markers (<<<<<<<, =======, >>>>>>>) remain near validateTailoredProfileHashConsistency and storageToInternalProfileKind. These will break the build and tooling; resolve the conflicts and remove all markers before merging.
18097ac to
699451c
Compare
Contributor
|
/konflux-retest main-on-push |
Contributor
|
/konflux-retest scanner-v4-on-push |
Contributor
|
/konflux-retest operator-on-push |
Contributor
Author
|
Closed in favor of #19545 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
change me!
User-facing documentation
Testing and quality
Automated testing
How I validated my change
change me!