Update to latest commit of argo-rollouts-manager '3e07addcb2cbf65869ebf04b26f72dc61fc26b8a'#1159
Merged
openshift-merge-bot[bot] merged 2 commits intoMay 29, 2026
Conversation
…bf04b26f72dc61fc26b8a' Signed-off-by: Jonathan West <jgwest@gmail.com>
olivergondza
previously approved these changes
May 26, 2026
|
@coderabbitai testing if it works |
|
Tip For best results, initiate chat on the files or code changes.
|
📝 WalkthroughWalkthroughThis PR regenerates five Kubernetes CustomResourceDefinition (CRD) manifests using a newer ChangesCRD Schema Regeneration with controller-gen v0.19.0 and RolloutManager NetworkPolicy
EKS API Group RBAC Permissions
Dependency and Script Updates
🎯 4 (Complex) | ⏱️ ~45 minutes 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. 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)
test/openshift/e2e/ginkgo/parallel/1-090_validate_permissions_test.go (1)
439-446:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winapiGroups order mismatch will cause test failure.
The test expects
elbv2.k8s.awsbeforeeks.amazonaws.com, but the actual CSV manifest (bundle/manifests/gitops-operator.clusterserviceversion.yamllines 632-633) has them in reverse order:eks.amazonaws.comfirst, thenelbv2.k8s.aws. Since line 736 usesEqual()for deep comparison, this ordering difference will fail the test.Proposed fix
- apiGroups: - - elbv2.k8s.aws - eks.amazonaws.com + - elbv2.k8s.aws resources:🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@test/openshift/e2e/ginkgo/parallel/1-090_validate_permissions_test.go` around lines 439 - 446, The failure is due to mismatched ordering of the apiGroups array in the expected object used in the test (the apiGroups block in 1-090_validate_permissions_test.go) vs the actual CSV manifest; update the expected apiGroups order to match the manifest (place "eks.amazonaws.com" before "elbv2.k8s.aws") so the deep equality assertion (the Equal() comparison used later in this test) passes, or alternatively change the assertion to compare sets/ignore order; prefer adjusting the apiGroups literal order to match the CSV for minimal change.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@bundle/manifests/argoproj.io_clusteranalysistemplates.yaml`:
- Around line 3074-3077: The manifest changes add flattened fields
resourceClaimName and resourceClaimTemplateName inside resourceClaims on the
existing v1alpha1 CRD, which can break upgrades; instead preserve backward
compatibility by either (A) reverting the in-place shape change and adding a
oneOf that accepts both the old nested structure and the new flat structure for
resourceClaims (use oneOf to accept both shapes) or (B) move this schema change
into a new CRD version (e.g., v1beta1) and implement a conversion/migration path
so existing v1alpha1 objects are converted; update the CRD schema around
resourceClaims (and references to resourceClaimName/resourceClaimTemplateName)
accordingly and ensure the stored version remains compatible.
---
Outside diff comments:
In `@test/openshift/e2e/ginkgo/parallel/1-090_validate_permissions_test.go`:
- Around line 439-446: The failure is due to mismatched ordering of the
apiGroups array in the expected object used in the test (the apiGroups block in
1-090_validate_permissions_test.go) vs the actual CSV manifest; update the
expected apiGroups order to match the manifest (place "eks.amazonaws.com" before
"elbv2.k8s.aws") so the deep equality assertion (the Equal() comparison used
later in this test) passes, or alternatively change the assertion to compare
sets/ignore order; prefer adjusting the apiGroups literal order to match the CSV
for minimal change.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Enterprise
Run ID: 1714ad19-7c7c-4849-b03d-8febca757d47
⛔ Files ignored due to path filters (1)
go.sumis excluded by!**/*.sum
📒 Files selected for processing (19)
bundle/manifests/argoproj.io_analysisruns.yamlbundle/manifests/argoproj.io_analysistemplates.yamlbundle/manifests/argoproj.io_clusteranalysistemplates.yamlbundle/manifests/argoproj.io_experiments.yamlbundle/manifests/argoproj.io_rolloutmanagers.yamlbundle/manifests/argoproj.io_rollouts.yamlbundle/manifests/gitops-operator.clusterserviceversion.yamlconfig/crd/bases/analysis-run-crd.yamlconfig/crd/bases/analysis-template-crd.yamlconfig/crd/bases/argoproj.io_rolloutmanagers.yamlconfig/crd/bases/cluster-analysis-template-crd.yamlconfig/crd/bases/experiment-crd.yamlconfig/crd/bases/rollout-crd.yamlconfig/rbac/role.yamlcontrollers/gitopsservice_controller.gogo.modscripts/run-rollouts-e2e-tests.shtest/openshift/e2e/ginkgo/parallel/1-090_validate_permissions_test.gotest/openshift/e2e/ginkgo/sequential/1-101_validate_rollout_policyrules_test.go
Signed-off-by: Jonathan West <jgwest@gmail.com>
jgwest
force-pushed
the
upgrade-rollouts-manager
branch
from
90b426d to
9810c17
Compare
Member
Author
|
/retest |
1 similar comment
Member
Author
|
/retest |
Collaborator
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: svghadi 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-merge-bot
Bot
merged commit aacca24
into
redhat-developer:master
17 checks passed
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.
Update to most recent 'argo-rollouts-manager' commit: argoproj-labs/argo-rollouts-manager@3e07add
The Rollouts E2E tests don't currently run as part of gitops-operator PRs, so I ran those automated tests manually against this commit, and they passed.