Skip to content

chore: sync our fork to 3.1.5 sync branch #428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
ppapapetrou76 merged 13 commits into from
Sep 18, 2025
Merged

chore: sync our fork to 3.1.5 sync branch #428

ppapapetrou76 merged 13 commits into from
Sep 18, 2025

Conversation

@ppapapetrou76
Copy link
Collaborator

@ppapapetrou76 ppapapetrou76 commented Sep 16, 2025

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

oleksandr-codefresh and others added 13 commits September 16, 2025 17:32
@oleksandr-codefresh @reggie-k
@nitishfy @ppapapetrou76
chore: sync all codefresh code changes into v3.0.2 (#397)
82389a7 
* chore: sync all codefresh code changes into v3.0.2 without event-reporter related changes

Signed-off-by: oleksandr-codefresh <oleksandr.saulyak@octopus.com>

* removed cf script

Signed-off-by: oleksandr-codefresh <oleksandr.saulyak@octopus.com>

* upgraded git-lfs to 3.6.1 in Dockerfile (#386)

Signed-off-by: reggie-k <regina.voloshin@codefresh.io>
Signed-off-by: oleksandr-codefresh <oleksandr.saulyak@octopus.com>

* fixed webstorm go.mod issue

Signed-off-by: oleksandr-codefresh <oleksandr.saulyak@octopus.com>

* e2e: improved error logs

Signed-off-by: oleksandr-codefresh <oleksandr.saulyak@octopus.com>

* fixed changes on generated files

Signed-off-by: oleksandr-codefresh <oleksandr.saulyak@octopus.com>

* chore: replace heptio-images with argocd-e2e-container (argoproj#23040)

Signed-off-by: nitishfy <justnitish06@gmail.com>
Signed-off-by: Nitish Kumar <justnitish06@gmail.com>

(cherry picked from commit 309acd1)
Signed-off-by: oleksandr-codefresh <oleksandr.saulyak@octopus.com>

* feat: upgraded github.com/expr-lang/expr from 0.16.9 to 0.17.0

Signed-off-by: oleksandr-codefresh <oleksandr.saulyak@octopus.com>

* e2e [TestTrackAppStateAndSyncApp / TestNewStyleResourceActionMixedOk / TestNewStyleResourceActionPermitted / TestNamespacedPermissions]: added wait for sync operation

Signed-off-by: oleksandr-codefresh <oleksandr.saulyak@octopus.com>

---------

Signed-off-by: oleksandr-codefresh <oleksandr.saulyak@octopus.com>
Signed-off-by: reggie-k <regina.voloshin@codefresh.io>
Co-authored-by: Regina Voloshin <regina.voloshin@codefresh.io>
Co-authored-by: Nitish Kumar <justnitish06@gmail.com>
# Conflicts:
#	.github/workflows/ci-build.yaml
#	cmd/argocd/commands/app_test.go
#	go.mod
#	go.sum
#	manifests/base/kustomization.yaml
#	manifests/core-install-with-hydrator.yaml
#	manifests/core-install.yaml
#	manifests/core-install/kustomization.yaml
#	manifests/ha/base/kustomization.yaml
#	manifests/ha/install-with-hydrator.yaml
#	manifests/ha/install.yaml
#	manifests/ha/namespace-install-with-hydrator.yaml
#	manifests/ha/namespace-install.yaml
#	manifests/install-with-hydrator.yaml
#	manifests/install.yaml
#	manifests/namespace-install-with-hydrator.yaml
#	manifests/namespace-install.yaml
#	pkg/apiclient/application/application.pb.go
#	pkg/apiclient/application/application.pb.gw.go
#	pkg/apis/application/v1alpha1/generated.pb.go
#	reposerver/apiclient/mocks/RepoServerServiceClient.go
#	reposerver/apiclient/repository.pb.go
#	server/application/application.proto
#	util/git/mocks/Client.go
@oleksandr-codefresh @ppapapetrou76
fix(validateDestination query): as we moved to argo.GetDestinationClu…
7e467dd 
…ster, we can simply rely on error returned from this request (#405)

Signed-off-by: oleksandr-codefresh <oleksandr.saulyak@octopus.com>
@reggie-k @ppapapetrou76
removed curl from image (#406)
56418b0 
Signed-off-by: reggie-k <regina.voloshin@codefresh.io>
@reggie-k @andrii-korotkov-verkada @ppapapetrou76
feat: Add GitHub API metrics (#404)
be767e9 
* added github api metrics

Signed-off-by: reggie-k <regina.voloshin@codefresh.io>

* fix(docs): fix applicationsetcontroller.enable.github.api.metrics to false in docs cm (argoproj#23516)

Signed-off-by: reggie-k <regina.voloshin@codefresh.io>

* fix: Account for batch event processing in e2e tests (argoproj#22356)

Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com>

---------

Signed-off-by: reggie-k <regina.voloshin@codefresh.io>
Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com>
Co-authored-by: Andrii Korotkov <137232734+andrii-korotkov-verkada@users.noreply.github.com>
@reggie-k @dudinea @ppapapetrou76
cherry-pick 1b48f36 Upgrade ubuntu base image to latest 25.04 digest (#…
20f7b80 
…407)

Signed-off-by: reggie-k <regina.voloshin@codefresh.io>
Co-authored-by: dudinea <eugene.doudine@octopus.com>
@reggie-k @ppapapetrou76
feat: CR-29912 manual cherry pick app set pr generator return 0 resul…
32f460b 
…ts if the repo does not exist (#409)

* manually added the changes

Signed-off-by: reggie-k <regina.voloshin@codefresh.io>

* pull request functionality

Signed-off-by: reggie-k <regina.voloshin@codefresh.io>

* pull request functionality

Signed-off-by: reggie-k <regina.voloshin@codefresh.io>

---------

Signed-off-by: reggie-k <regina.voloshin@codefresh.io>
@reggie-k @crenshaw-dev
@agaudreault @ppapapetrou76
feat: move pkg/exec in-tree and add fatal timeout upgrade with SIGKIL…
d878349 
…L to ARGO_EXEC_TIMEOUT (#419)

* chore: move pkg/exec in-tree (argoproj#22175) (argoproj#22460)

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

* fix: add fatal timeout upgrade with SIGKILL to ARGO_EXEC_TIMEOUT (closes argoproj#20785, argoproj#18478) (argoproj#22713)

Signed-off-by: Hazel Sudzilouski <dsudzilouski@olin.edu>
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

---------

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Signed-off-by: Hazel Sudzilouski <dsudzilouski@olin.edu>
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: Hazel Sudzilouski <t-danielsu@microsoft.com>
Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
@reggie-k @ppapapetrou76
feat: CR-30512 stop using bitnami images (#420)
254a0c1 
* removed references from all the images except for astra healthcheck

Signed-off-by: reggie-k <regina.voloshin@codefresh.io>

* removed reposerver/repository/testdata/helm-with-local-dependency/.argocd-helm-dep-up

Signed-off-by: reggie-k <regina.voloshin@codefresh.io>

* reverted health check references since they are treated as text

Signed-off-by: reggie-k <regina.voloshin@codefresh.io>

* reverted health check references since they are treated as text

Signed-off-by: reggie-k <regina.voloshin@codefresh.io>

---------

Signed-off-by: reggie-k <regina.voloshin@codefresh.io>
@ppapapetrou76
chore: bumps redis to 8.x (#422)
e4313f9 
* bumps Docker test container to redis 8

* bumps redis version to 8.2.1

Signed-off-by: Patroklos Papapetrou <ppapapetrou76@gmail.com>

* use a previous version of go-redis

Signed-off-by: Patroklos Papapetrou <ppapapetrou76@gmail.com>

---------

Signed-off-by: Patroklos Papapetrou <ppapapetrou76@gmail.com>
@ppapapetrou76
upgrade sqlite in docker image to address CVE-2025-6965 (#425)
f657dea
@ppapapetrou76
final changes after rebase
5281363 
Signed-off-by: Patroklos Papapetrou <ppapapetrou76@gmail.com>
@ppapapetrou76
final changes after rebase
901fe22 
Signed-off-by: Patroklos Papapetrou <ppapapetrou76@gmail.com>
@ppapapetrou76
address new linter issues
f4808a5 
Signed-off-by: Patroklos Papapetrou <ppapapetrou76@gmail.com>
@codecov
Copy link

codecov bot commented Sep 17, 2025

Codecov Report

❌ Patch coverage is 22.47706% with 845 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
server/application/application_rollout_rollback.go 0.00% 159 Missing ⚠️
...commands/application_change_revision_controller.go 2.88% 101 Missing ⚠️
acr_controller/server.go 0.00% 84 Missing ⚠️
acr_controller/service/acr_service.go 52.48% 59 Missing and 8 partials ⚠️
acr_controller/application/client.go 0.00% 57 Missing ⚠️
...r/application/application_validate_src_and_dest.go 0.00% 53 Missing ⚠️
reposerver/repository/cf_repository.go 23.52% 50 Missing and 2 partials ⚠️
acr_controller/controller/broadcaster.go 0.00% 50 Missing ⚠️
util/kustomize/repospec.go 64.70% 31 Missing and 5 partials ⚠️
acr_controller/controller/controller.go 0.00% 34 Missing ⚠️
... and 10 more

📢 Thoughts on this report? Let us know!

@ppapapetrou76 ppapapetrou76 merged commit 389d443 into sync-3.1.5 Sep 18, 2025
23 checks passed
@ppapapetrou76 ppapapetrou76 deleted the feature/3.1.5-sync branch September 18, 2025 09:17
@ppapapetrou76 ppapapetrou76 mentioned this pull request Oct 1, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ATGardner ATGardner ATGardner approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ppapapetrou76 @ATGardner @oleksandr-codefresh @reggie-k