Merge-upstream.md

Process of merging upstream changes

1. create "sync-3.0.2" branch on top of upstream v3.0.2 tag (git checkout -b sync-3.0.2 v3.0.2), push to codefresh-io/argocd
2. create branch "make-cf-changes" on current release (sync-2.14.9 HEAD)
3. rebase onto sync-3.0.2 ("git rebase --onto sync-3.0.2 v2.14.9 make-cf-changes)
4. make a pr from "make-cf-changes" into "sync-3.0.2".
   1. the pr will trigger dev image builds, e2e runs, etc (quay.io/codefresh/dev/argocd)
5. fix conflicts, test, fixes, whatever (by instuction in following section)
6. merge pr
   1. merge will create official image of fork (quay.io/codefresh/argocd)
   2. manually create tag "v3.0.2-YYYY-MM-DD-SHA"
   3. THERE IS NOT GITHUB RELEASE

Resolving conflicts during upstream changes merge

This docs include info about places where codefresh made it's customizations:

General notes:

1. All files that're deleted in our branches - we can keep deleted (accept ours).
2. all xxx.pb.go - apply theirs and after resolving conflicts re-generate.

Paths and actions on them

1. .github/workflows - accept ours (yours).
2. applicationset - accept theirs
3. assets / swagger - accept ours. Later run codegen and commit new version
4. cmd / argocd - accept ours if files deleted.
5. cmd / argocd-application-controller - no custom thing from our side, so just resolve conflicts.
6. cmd / notifications - no custom thing from our side, so just accept theirs.
7. cmd / argocd-repo-server - includes our changes with codefresh related parameters.
8. cmd / common - includes our changes with codefresh related constants (event-reporter)
9. cmd / controller / application.go - includes our changes to resource node (to return labels and annotations getResourceTree method)
10. cmd / controller / state.go - includes our changes (GetRepoObjs method)
11. cmd / controller / state_test.go - includes our changes. Replace manifest values with our struct apiclient.Manifest`
12. docs - apply theirs
13. examples - apply theirs
14. hack - apply theirs
15. manifests - accept theirs
16. notification_controller - apply theirs
17. pkg/apis/application/v1alpha - generatedXXX - apply theirs (than re-generate). types.go - merge (includes our changes with ForceNamespace).
18. server / application.go - merge (includes our v1 event-reporter.)
19. ui - accept theirs.
20. util / kustomize - merge, as it includes ours changes.
21. mkdocs.yaml - apply theirs.
22. go.mod - merge direct dependencies. go.sum accept theirs. Run go mod tidy. Check replace section, perform cleanup if needed.
23. reposerver / sepository.go - merge, includes: cf appVersion logic; type manifest struct (with path to file, rawManifest);

Post actions:

1. run go mod tidy
2. run go mod download
3. run go mod vendor
4. run make install-tools-local
5. run make lint-local
6. run make protogen-fast - because sometimes gogen won't work if types from protogen used
7. run make codegen
8. run make test-local

Thoughts

1. Revert cherry picks before merges - as they cause issues later if in upstream decided to slightly move some parts of such changes. In this case no conflicts will occur during merge as they on different lines but then you need cleanup them manually.