[v2.9] rebase for v2.9.6

Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
flux-subsystem-argo · Feb 9, 2024 · 89506f8 · 89506f8
1 parent d20be6c
commit 89506f8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/patches-argo-cd-v2.9/01-build-with-local-gitops-engine.patch b/patches-argo-cd-v2.9/01-build-with-local-gitops-engine.patch
@@ -51,13 +51,13 @@ index 2c31b5077..5e6bb92f0 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 7129d4248..965d67524 100644
+index af07829a3..671c26d59 100644
 --- a/go.mod
 +++ b/go.mod
 @@ -324,4 +324,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
+ 	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.17
+ 	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.24.17
+ 	k8s.io/sample-controller => k8s.io/sample-controller v0.24.17
 +
 +	github.com/argoproj/gitops-engine v0.7.1-0.20230906152414-b0fffe419a0f => ./gitops-engine
  )
diff --git a/patches-argo-cd-v2.9/02-implement-loopback.patch b/patches-argo-cd-v2.9/02-implement-loopback.patch
@@ -10,10 +10,10 @@ 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 19757510a..535eba82a 100644
+index 40e2f9a5f..e711182b3 100644
 --- a/controller/state.go
 +++ b/controller/state.go
-@@ -402,12 +402,18 @@ func (m *appStateManager) CompareAppState(app *v1alpha1.Application, project *v1
+@@ -407,12 +407,18 @@ func (m *appStateManager) CompareAppState(app *v1alpha1.Application, project *v1
  			}
  		}
 

diff --git a/patches-argo-cd-v2.9/03-allow-flux-and-oci-schemes.patch b/patches-argo-cd-v2.9/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 1498dd81d..90039a9e5 100644
+index bff2983a1..2d910a5d6 100644
 --- a/reposerver/repository/repository.go
 +++ b/reposerver/repository/repository.go
-@@ -2460,6 +2460,11 @@ func (s *Service) TestRepository(ctx context.Context, q *apiclient.TestRepositor
+@@ -2465,6 +2465,11 @@ func (s *Service) TestRepository(ctx context.Context, q *apiclient.TestRepositor
  	}
  	check := checks[repo.Type]
  	apiResp := &apiclient.TestRepositoryResponse{VerifiedRepository: false}
@@ -41,7 +41,7 @@ index 12484685e..aa6993cb0 100644
 
  	resolveRevisionResponse, err := repoClient.ResolveRevision(ctx, &apiclient.ResolveRevisionRequest{
 diff --git a/util/argo/argo.go b/util/argo/argo.go
-index 9187726ab..541b8b24f 100644
+index 36e513cf0..ae3ceea5a 100644
 --- a/util/argo/argo.go
 +++ b/util/argo/argo.go
 @@ -291,6 +291,11 @@ func ValidateRepo(

diff --git a/...v2.9/13-upgrade-to-flux-v2-0-0-rc-1.patch → ...v2.9/13-upgrade-to-flux-v2.0.0-rc.1.patch b/...v2.9/13-upgrade-to-flux-v2-0-0-rc-1.patch → ...v2.9/13-upgrade-to-flux-v2.0.0-rc.1.patch
diff --git a/patches-argo-cd-v2.9/series b/patches-argo-cd-v2.9/series
@@ -1,4 +1,4 @@
-# This series applies on Git commit 6648d31671984ed8fc521fe494cd4df8c1f5061a
+# This series applies on Git commit ba62a0a86d19f71a65ec2b510a39ea55497e1580
 01-build-with-local-gitops-engine.patch
 02-implement-loopback.patch
 03-allow-flux-and-oci-schemes.patch
@@ -11,7 +11,7 @@
 10-add-flux-options-to-the-ui.patch
 11-support-helm-oci-and.patch
 12-add-open-in-weave-gitops.patch
-13-upgrade-to-flux-v2-0-0-rc-1.patch
+13-upgrade-to-flux-v2.0.0-rc.1.patch
 14-fix-branch-and-rev-info-of.patch
 15-change-logo-to-flamingo.patch
 16-override-workload-name-with.patch