[v2.7] merge conflict in controller/state

Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
flux-subsystem-argo · Jun 22, 2023 · 7e18667 · 7e18667
1 parent 2a6435b
commit 7e18667
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/patches-argo-cd-v2.7/02-implement-loopback.patch b/patches-argo-cd-v2.7/02-implement-loopback.patch
@@ -10,14 +10,14 @@ Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
  create mode 100644 controller/state_fsa.go
 
 diff --git a/controller/state.go b/controller/state.go
-index cac9b75af..169f697a2 100644
+index ff09a00c7..051ee1e4b 100644
 --- a/controller/state.go
 +++ b/controller/state.go
-@@ -418,11 +418,17 @@ func (m *appStateManager) CompareAppState(app *v1alpha1.Application, project *ap
+@@ -405,11 +405,17 @@ func (m *appStateManager) CompareAppState(app *v1alpha1.Application, project *ap
  			}
  		}
 
--		targetObjs, manifestInfoMap, err = m.getRepoObjs(app, sources, appLabelKey, revisions, noCache, noRevisionCache, verifySignature, project)
+-		targetObjs, manifestInfos, err = m.getRepoObjs(app, sources, appLabelKey, revisions, noCache, noRevisionCache, verifySignature, project)
 -		if err != nil {
 -			targetObjs = make([]*unstructured.Unstructured, 0)
 -			conditions = append(conditions, v1alpha1.ApplicationCondition{Type: v1alpha1.ApplicationConditionComparisonError, Message: err.Error(), LastTransitionTime: &now})
@@ -27,7 +27,7 @@ index cac9b75af..169f697a2 100644
 +		} else if isFluxSubsystemEnabled(app) && !app.Spec.Source.IsHelm() {
 +			targetObjs, conditions, failedToLoadObjs = m.getFluxKustomizeTargetObjects(app, conditions, now)
 +		} else {
-+			targetObjs, manifestInfoMap, err = m.getRepoObjs(app, sources, appLabelKey, revisions, noCache, noRevisionCache, verifySignature, project)
++			targetObjs, manifestInfos, err = m.getRepoObjs(app, sources, appLabelKey, revisions, noCache, noRevisionCache, verifySignature, project)
 +			if err != nil {
 +				targetObjs = make([]*unstructured.Unstructured, 0)
 +				conditions = append(conditions, v1alpha1.ApplicationCondition{Type: v1alpha1.ApplicationConditionComparisonError, Message: err.Error(), LastTransitionTime: &now})

diff --git a/patches-argo-cd-v2.7/03-allow-flux-and-oci-schemes.patch b/patches-argo-cd-v2.7/03-allow-flux-and-oci-schemes.patch
@@ -10,10 +10,10 @@ Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
  3 files changed, 14 insertions(+)
 
 diff --git a/reposerver/repository/repository.go b/reposerver/repository/repository.go
-index 1ad311fe5..bed5f3b8c 100644
+index 4882fe7e0..dbd333fb8 100644
 --- a/reposerver/repository/repository.go
 +++ b/reposerver/repository/repository.go
-@@ -2438,6 +2438,11 @@ func (s *Service) TestRepository(ctx context.Context, q *apiclient.TestRepositor
+@@ -2437,6 +2437,11 @@ func (s *Service) TestRepository(ctx context.Context, q *apiclient.TestRepositor
  	}
  	check := checks[repo.Type]
  	apiResp := &apiclient.TestRepositoryResponse{VerifiedRepository: false}

diff --git a/patches-argo-cd-v2.7/series b/patches-argo-cd-v2.7/series
@@ -1,4 +1,4 @@
-# This series applies on GIT commit a2430af1c356b283e5e3fc5bde1f5e2b5199f258
+# This series applies on GIT commit 00c914a948d9e8ad99be8bd82a368fbdeba12f88
 01-build-with-local-gitops-engine.patch
 02-implement-loopback.patch
 03-allow-flux-and-oci-schemes.patch