[v2.6] fix merge conflict in controller/state

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

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/patches-argo-cd-v2.6/01-build-with-local-gitops-engine.patch b/patches-argo-cd-v2.6/01-build-with-local-gitops-engine.patch
@@ -20,10 +20,10 @@ index 869bb876f..e05fdda3e 100644
 +
 +gitops-engine/
 diff --git a/Dockerfile b/Dockerfile
-index 3a434bc3b..6d69cfc51 100644
+index 97c3257ec..d1b6433f0 100644
 --- a/Dockerfile
 +++ b/Dockerfile
-@@ -103,7 +103,9 @@ FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.18 AS argocd-build
+@@ -103,7 +103,9 @@ FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.19.10@sha256:83f9f8400
 
  WORKDIR /go/src/github.com/argoproj/argo-cd
 
@@ -51,10 +51,10 @@ index 3a434bc3b..6d69cfc51 100644
      ln -s /usr/local/bin/argocd /usr/local/bin/argocd-repo-server && \
      ln -s /usr/local/bin/argocd /usr/local/bin/argocd-cmp-server && \
 diff --git a/go.mod b/go.mod
-index 9a3876f4f..9a26192c5 100644
+index e1cfa51fb..12b7dc6d5 100644
 --- a/go.mod
 +++ b/go.mod
-@@ -296,4 +296,6 @@ replace (
+@@ -295,4 +295,6 @@ replace (
  	k8s.io/mount-utils => k8s.io/mount-utils v0.24.2
  	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.2
  	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.2

diff --git a/patches-argo-cd-v2.6/02-implement-loopback.patch b/patches-argo-cd-v2.6/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 4f2a8d2f6..20cfe89a7 100644
+index 92a7931c8..1d92ae88f 100644
 --- a/controller/state.go
 +++ b/controller/state.go
-@@ -411,11 +411,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 4f2a8d2f6..20cfe89a7 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.6/03-allow-flux-and-oci-schemes.patch b/patches-argo-cd-v2.6/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 ad5a7ab2c..81b842060 100644
+index 4882fe7e0..dbd333fb8 100644
 --- a/reposerver/repository/repository.go
 +++ b/reposerver/repository/repository.go
-@@ -2435,6 +2435,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.6/series b/patches-argo-cd-v2.6/series
@@ -1,4 +1,4 @@
-# This series applies on GIT commit 5bcd846fa16e4b19d8f477de7da50ec0aef320e5
+# This series applies on GIT commit 697fd7c9a36725fec0b345e4147e1d19e15773cc
 01-build-with-local-gitops-engine.patch
 02-implement-loopback.patch
 03-allow-flux-and-oci-schemes.patch