From 8fdad89c95d0b1dd15f7d75e1240fe099333d710 Mon Sep 17 00:00:00 2001 From: Chanwit Kaewkasi Date: Sun, 29 Oct 2023 19:48:17 +0700 Subject: [PATCH] [v2.9] fix patch indexes Signed-off-by: Chanwit Kaewkasi --- .../01-build-with-local-gitops-engine.patch | 8 ++++---- patches-argo-cd-v2.9/02-implement-loopback.patch | 4 ++-- .../03-allow-flux-and-oci-schemes.patch | 12 ++++++------ .../04-ui-fix-find-leaf-pod-bug.patch | 2 +- .../12-add-open-in-weave-gitops.patch | 2 +- .../15-change-logo-to-flamingo.patch | 2 +- patches-argo-cd-v2.9/17-add-tilt-dev-support.patch | 2 +- .../19-fix-special-supported-schemes.patch | 4 ++-- patches-argo-cd-v2.9/series | 2 +- 9 files changed, 19 insertions(+), 19 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 index 5a336cf..bff7c11 100644 --- 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 @@ -20,10 +20,10 @@ index ab17deb0d..c28c77a6a 100644 + +gitops-engine/ diff --git a/Dockerfile b/Dockerfile -index f69e34cce..07e9df925 100644 +index 2c31b5077..5e6bb92f0 100644 --- a/Dockerfile +++ b/Dockerfile -@@ -105,7 +105,9 @@ FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.20.6@sha256:8e5a0067e6 +@@ -105,7 +105,9 @@ FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.21.3@sha256:02d7116222 WORKDIR /go/src/github.com/argoproj/argo-cd @@ -51,10 +51,10 @@ index f69e34cce..07e9df925 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 de020933a..00b641f31 100644 +index 7129d4248..965d67524 100644 --- a/go.mod +++ b/go.mod -@@ -306,4 +306,6 @@ replace ( +@@ -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 diff --git a/patches-argo-cd-v2.9/02-implement-loopback.patch b/patches-argo-cd-v2.9/02-implement-loopback.patch index a2d638d..377a489 100644 --- 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 create mode 100644 controller/state_fsa.go diff --git a/controller/state.go b/controller/state.go -index a2765f249..126102552 100644 +index 19757510a..535eba82a 100644 --- a/controller/state.go +++ b/controller/state.go -@@ -395,12 +395,18 @@ func (m *appStateManager) CompareAppState(app *v1alpha1.Application, project *v1 +@@ -402,12 +402,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 index 8265653..9a84c10 100644 --- 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 3 files changed, 14 insertions(+) diff --git a/reposerver/repository/repository.go b/reposerver/repository/repository.go -index 02fb6a20d..aceb2ad6a 100644 +index 1498dd81d..90039a9e5 100644 --- a/reposerver/repository/repository.go +++ b/reposerver/repository/repository.go -@@ -2429,6 +2429,11 @@ func (s *Service) TestRepository(ctx context.Context, q *apiclient.TestRepositor +@@ -2460,6 +2460,11 @@ func (s *Service) TestRepository(ctx context.Context, q *apiclient.TestRepositor } check := checks[repo.Type] apiResp := &apiclient.TestRepositoryResponse{VerifiedRepository: false} @@ -26,10 +26,10 @@ index 02fb6a20d..aceb2ad6a 100644 if err != nil { return apiResp, fmt.Errorf("error testing repository connectivity: %w", err) diff --git a/server/application/application.go b/server/application/application.go -index a0323cde5..534d1aa47 100644 +index 12484685e..aa6993cb0 100644 --- a/server/application/application.go +++ b/server/application/application.go -@@ -2010,6 +2010,10 @@ func (s *Server) resolveRevision(ctx context.Context, app *appv1.Application, sy +@@ -2019,6 +2019,10 @@ func (s *Server) resolveRevision(ctx context.Context, app *appv1.Application, sy // If it's already a commit SHA, then no need to look it up return ambiguousRevision, ambiguousRevision, nil } @@ -41,10 +41,10 @@ index a0323cde5..534d1aa47 100644 resolveRevisionResponse, err := repoClient.ResolveRevision(ctx, &apiclient.ResolveRevisionRequest{ diff --git a/util/argo/argo.go b/util/argo/argo.go -index b32369ea7..f9ddd99d5 100644 +index 9187726ab..541b8b24f 100644 --- a/util/argo/argo.go +++ b/util/argo/argo.go -@@ -287,6 +287,11 @@ func ValidateRepo( +@@ -291,6 +291,11 @@ func ValidateRepo( conditions := make([]argoappv1.ApplicationCondition, 0) diff --git a/patches-argo-cd-v2.9/04-ui-fix-find-leaf-pod-bug.patch b/patches-argo-cd-v2.9/04-ui-fix-find-leaf-pod-bug.patch index fb88881..3b21968 100644 --- a/patches-argo-cd-v2.9/04-ui-fix-find-leaf-pod-bug.patch +++ b/patches-argo-cd-v2.9/04-ui-fix-find-leaf-pod-bug.patch @@ -30,7 +30,7 @@ index 647750937..a440f3db1 100644 const settings = await services.authService.settings(); diff --git a/ui/src/app/applications/components/utils.tsx b/ui/src/app/applications/components/utils.tsx -index 0df581ca0..14385989d 100644 +index 674ffc672..f0c7642d7 100644 --- a/ui/src/app/applications/components/utils.tsx +++ b/ui/src/app/applications/components/utils.tsx @@ -458,7 +458,8 @@ function getActionItems( diff --git a/patches-argo-cd-v2.9/12-add-open-in-weave-gitops.patch b/patches-argo-cd-v2.9/12-add-open-in-weave-gitops.patch index 59b7a87..02aa745 100644 --- a/patches-argo-cd-v2.9/12-add-open-in-weave-gitops.patch +++ b/patches-argo-cd-v2.9/12-add-open-in-weave-gitops.patch @@ -8,7 +8,7 @@ Signed-off-by: Chanwit Kaewkasi 1 file changed, 45 insertions(+) diff --git a/ui/src/app/applications/components/utils.tsx b/ui/src/app/applications/components/utils.tsx -index 14385989d..88904f6fc 100644 +index f0c7642d7..f91234ee1 100644 --- a/ui/src/app/applications/components/utils.tsx +++ b/ui/src/app/applications/components/utils.tsx @@ -424,6 +424,28 @@ function getResourceActionsMenuItems(resource: ResourceTreeNode, metadata: model diff --git a/patches-argo-cd-v2.9/15-change-logo-to-flamingo.patch b/patches-argo-cd-v2.9/15-change-logo-to-flamingo.patch index efa3e26..bfa0d2f 100644 --- a/patches-argo-cd-v2.9/15-change-logo-to-flamingo.patch +++ b/patches-argo-cd-v2.9/15-change-logo-to-flamingo.patch @@ -53,7 +53,7 @@ index db67ff185..75ecd6a27 100644 diff --git a/ui/src/app/sidebar/sidebar.scss b/ui/src/app/sidebar/sidebar.scss -index e448bdf4f..50e5e69ae 100644 +index a3ff7a035..153dc5eb8 100644 --- a/ui/src/app/sidebar/sidebar.scss +++ b/ui/src/app/sidebar/sidebar.scss @@ -44,7 +44,7 @@ $deselected-text: #818d94; diff --git a/patches-argo-cd-v2.9/17-add-tilt-dev-support.patch b/patches-argo-cd-v2.9/17-add-tilt-dev-support.patch index 7b19df3..7154e18 100644 --- a/patches-argo-cd-v2.9/17-add-tilt-dev-support.patch +++ b/patches-argo-cd-v2.9/17-add-tilt-dev-support.patch @@ -12,7 +12,7 @@ Signed-off-by: Chanwit Kaewkasi create mode 100644 argocd-server-dev.yaml diff --git a/Makefile b/Makefile -index aceebcc66..2b12b5616 100644 +index 4c1191881..795da41ae 100644 --- a/Makefile +++ b/Makefile @@ -291,20 +291,23 @@ build-ui: diff --git a/patches-argo-cd-v2.9/19-fix-special-supported-schemes.patch b/patches-argo-cd-v2.9/19-fix-special-supported-schemes.patch index 11fc813..149974b 100644 --- a/patches-argo-cd-v2.9/19-fix-special-supported-schemes.patch +++ b/patches-argo-cd-v2.9/19-fix-special-supported-schemes.patch @@ -8,10 +8,10 @@ Signed-off-by: Chanwit Kaewkasi 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/server/application/application.go b/server/application/application.go -index 534d1aa47..905f2b28e 100644 +index aa6993cb0..05d02a090 100644 --- a/server/application/application.go +++ b/server/application/application.go -@@ -2010,10 +2010,11 @@ func (s *Server) resolveRevision(ctx context.Context, app *appv1.Application, sy +@@ -2019,10 +2019,11 @@ func (s *Server) resolveRevision(ctx context.Context, app *appv1.Application, sy // If it's already a commit SHA, then no need to look it up return ambiguousRevision, ambiguousRevision, nil } diff --git a/patches-argo-cd-v2.9/series b/patches-argo-cd-v2.9/series index eaf191f..e370012 100644 --- a/patches-argo-cd-v2.9/series +++ b/patches-argo-cd-v2.9/series @@ -1,4 +1,4 @@ -# This series applies on Git commit 2bc94af7bd081bc4682c2c6dc005f6336c754c2b +# This series applies on Git commit 6648d31671984ed8fc521fe494cd4df8c1f5061a 01-build-with-local-gitops-engine.patch 02-implement-loopback.patch 03-allow-flux-and-oci-schemes.patch