Merge branch 'feat/app-deps' of github.com:jannfis/argo-cd into feat/…

…app-deps
argoproj · Sep 28, 2023 · eb9e1c8 · eb9e1c8
2 parents e067d43 + c53d800
commit eb9e1c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/controller/appcontroller.go b/controller/appcontroller.go
@@ -1186,7 +1186,7 @@ func (ctrl *ApplicationController) refreshDependencies(app *appv1.Application, s
 		}
 
 		if dep.RefreshedAt.IsZero() {
-			logCtx.Infof("Requesting refresh for app %s on behalf of dependency resolution", dep.QualifiedName())
+			logCtx.Infof("Requesting refresh for app %s to check dependencies", dep.QualifiedName())
 			ctrl.requestAppRefresh(dep.QualifiedName(), CompareWithLatest.Pointer(), nil)
 			dep.RefreshedAt = &metav1.Time{Time: time.Now()}
 		} else {

diff --git a/docs/user-guide/app_dependencies.md b/docs/user-guide/app_dependencies.md
@@ -8,7 +8,7 @@ Application dependencies support both, manual and automatic sync policies.
 
 ## Sync behaviour
 
-Defining dependencies for an Application will affect that Application's sync behaviour. When a sync is started, Argo CD will evaluate the sync and health status of all other Applications in the dependency tree. Only if all of the other Applications that the Application is dependent upon have a sync status of `Synced` and a health status of `Healthy`, the sync will proceed. Until all conditions are met, the sync will stay in a progressing state and a message will indicate that the sync is waiting for dependencies. This behaviour is similar to sync waves, where a sync progresses only to the next wave when the current wave's resources are all synced and healthy.
+Defining dependencies for an Application will affect its sync behaviour. When a sync is started, Argo CD will evaluate the sync and health status of all other Applications in its dependency tree. Only if all of its dependent Applications have a sync status of `Synced` and a health status of `Healthy`, will the sync proceed. Until all conditions are met, the sync will stay in a progressing state and a message will indicate that the sync is waiting for dependencies. This behaviour is similar to sync waves, where a sync progresses only to the next wave when the current wave's resources are all synced and healthy.
 
 As a fallback mechanism, when using manual sync with the force option, Argo CD will not perform dependency resolution and the sync will proceed regardless of the states of the Application's dependencies.