Elgato_dark/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd synced 2026-04-21 17:07:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

co-pilot review address

Browse source 
Signed-off-by: Kanika Rana <krana@redhat.com>
This commit is contained in:
Kanika Rana 2026-04-21 00:01:19 -04:00
parent ed50b93b9d
commit ace9a71fd5
2 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
applicationset/controllers/applicationset_controller.go
View file

@ -1045,7 +1045,7 @@ func (r *ApplicationSetReconciler) removeOwnerReferencesOnDeleteAppSet(ctx conte
}
// getLatestWaitingTransitionTimeOfAppset extracts the latest (most recent) LastTransitionTime from
// ApplicationSet status for Applications in Waiting state that have had a revision change (not new apps).
// ApplicationSet status for Applications in Waiting state that have had a pending changes (not new apps).
// Returns nil if no such Waiting applications are found.
// Using the latest time anchors the reconcile window so all apps must reconcile after the last
// detected change, not after the first (which can let apps through that reconciled before they
@ -1094,7 +1094,7 @@ func (r *ApplicationSetReconciler) addRefreshAnnotationToApplications(ctx contex
if err != nil {
return fmt.Errorf("error adding refresh annotation to app %s: %w", app.Name, err)
}
logCtx.WithField("app", app.Name).Info("Added refresh annotation to Application")
logCtx.WithField("app", app.Name).Debug("Added refresh annotation to Application")
}
return nil
}
@ -1106,8 +1106,8 @@ func checkAllApplicationsReconciled(applications []argov1alpha1.Application, log
return true
}
statusMap := make(map[string]argov1alpha1.ApplicationSetApplicationStatus)
for _, st := range appSetAppStatus {
statusMap[st.Application] = st
for _, appStatus := range appSetAppStatus {
statusMap[appStatus.Application] = appStatus
}
for _, app := range applications {
@ -1172,24 +1172,6 @@ func (r *ApplicationSetReconciler) ensureApplicationsReconciled(ctx context.Cont
logCtx.WithField("latest_waiting_time", latestWaitingTime.Time).Info("Applications have pending revision changes, checking if reconciliation needed")
// TODO: remove - Logs current state of all applications
for _, app := range applications {
hasAnnotation := app.Annotations != nil && app.Annotations[argov1alpha1.AnnotationKeyRefresh] != ""
var reconciledAt string
if app.Status.ReconciledAt != nil {
reconciledAt = app.Status.ReconciledAt.Format(time.RFC3339)
} else {
reconciledAt = "nil"
}
logCtx.WithFields(log.Fields{
"app": app.Name,
"hasRefresh": hasAnnotation,
"reconciledAt": reconciledAt,
"health": app.Status.Health.Status,
"sync": app.Status.Sync.Status,
}).Debug("Application state before reconciliation check")
}
// Check if all applications have been reconciled since the latestWaitingTime
allReconciled := checkAllApplicationsReconciled(applications, logCtx, appset, latestWaitingTime, appSetAppStatus)
if allReconciled {

4
applicationset/controllers/applicationset_controller_test.go
View file

@ -775,7 +775,7 @@ func TestCreateOrUpdateInCluster(t *testing.T) {
},
Spec: v1alpha1.ApplicationSpec{
Project: "project",
Source: &v1alpha1.ApplicationSource{
Source: &v1alpha1.ApplicationSource{
// Directory and jsonnet block are removed
},
},
@ -8960,7 +8960,7 @@ func TestEnsureApplicationsReconciled(t *testing.T) {
},
},
{
name: "applications in waiting but all reconciled returns true",
name: "any applications in waiting, and has refresh annotation, allReconciled returns false",
appset: v1alpha1.ApplicationSet{
ObjectMeta: metav1.ObjectMeta{
Name: "test-appset",