patch for ssa

seatgeek · Jun 10, 2024 · 5afbf3f · 5afbf3f
1 parent 3f344d5
commit 5afbf3f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/controller/state.go b/controller/state.go
@@ -658,7 +658,7 @@ func (m *appStateManager) CompareAppState(app *v1alpha1.Application, project *v1
  conditions = append(conditions, v1alpha1.ApplicationCondition{Type: v1alpha1.ApplicationConditionUnknownError, Message: err.Error(), LastTransitionTime: &now})
  }
  diffConfigBuilder.WithGVKParser(gvkParser)
- diffConfigBuilder.WithManager(common.ArgoCDSSAManager)
+ diffConfigBuilder.WithManager(app.GetName() + "-" + app.GetNamespace())
 
  diffConfigBuilder.WithServerSideDiff(serverSideDiff)
 

diff --git a/controller/sync.go b/controller/sync.go
@@ -322,7 +322,7 @@ func (m *appStateManager) SyncAppState(app *v1alpha1.Application, state *v1alpha
  sync.WithPrunePropagationPolicy(&prunePropagationPolicy),
  sync.WithReplace(syncOp.SyncOptions.HasOption(common.SyncOptionReplace)),
  sync.WithServerSideApply(syncOp.SyncOptions.HasOption(common.SyncOptionServerSideApply)),
- sync.WithServerSideApplyManager(cdcommon.ArgoCDSSAManager),
+ sync.WithServerSideApplyManager(app.GetName() + "-" + app.GetNamespace()),
  }
 
  if syncOp.SyncOptions.HasOption("CreateNamespace=true") {