fix(appset): avoid panic when no steps in rollingSync #20357
Merged
Conversation
This file contains 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
❌ Preview Environment deleted from BunnyshellAvailable commands (reply to this comment):
|
CefBoud
force-pushed
the
fix/appset-rolling-sync-step
branch
from
7027c9f to
e02882c
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #20357 +/- ##
=========================================
Coverage ? 55.08%
=========================================
Files ? 322
Lines ? 54932
Branches ? 0
=========================================
Hits ? 30260
Misses ? 22067
Partials ? 2605 ☔ View full report in Codecov by Sentry. |
christianh814
approved these changes
Oct 16, 2024
jannfis
reviewed
Oct 22, 2024
| @@ -1018,6 +1018,16 @@ func statusStrings(app argov1alpha1.Application) (string, string, string) { | |||
| return healthStatusString, syncStatusString, operationPhaseString | |||
| } | |||
|
|
|||
| func getAppStep(appName string, appStepMap map[string]int) string { | |||
There was a problem hiding this comment.
I think for further reusability of this function, it would make more sense to return an int instead of a string here.
CefBoud
force-pushed
the
fix/appset-rolling-sync-step
branch
from
e02882c to
31e75b1
Compare
Signed-off-by: cef <moncef.abboud95@gmail.com>
CefBoud
force-pushed
the
fix/appset-rolling-sync-step
branch
from
31e75b1 to
2b40a79
Compare
jannfis
approved these changes
Oct 23, 2024
|
/cherry-pick release-2.13 |
gcp-cherry-pick-bot bot
pushed a commit
that referenced
this pull request
Oct 23, 2024
Signed-off-by: cef <moncef.abboud95@gmail.com>
jannfis
pushed a commit
that referenced
this pull request
Oct 24, 2024
6 tasks
adriananeci
pushed a commit
to adriananeci/argo-cd
that referenced
this pull request
Dec 4, 2024
Signed-off-by: cef <moncef.abboud95@gmail.com> Signed-off-by: Adrian Aneci <aneci@adobe.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes #18817.
Description
When using Applicationset's rolling sync, having no steps in the manifest results in a panic. This PR attempts to fix that by ensuring a positive number of steps.
Additionally, applications not selected by MatchExpressions are still treated as part of
Step 1(actually Step 0 due to 1-based indexing) because theappStepMapdefaults to 0 and there is no validation for the presence in the map.These applications are not synced by the rolling sync. I suggest assigning them a value of
-1to clearly indicate that they are excluded from the sync and must be manually synced.Checklist: