Skip to content

Conversation

@reggie-k
Copy link
Member

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).

Signed-off-by: reggie-k <[email protected]>
@reggie-k reggie-k requested review from a team as code owners June 22, 2025 13:59
@bunnyshell
Copy link

bunnyshell bot commented Jun 22, 2025

❌ Preview Environment undeployed from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@reggie-k reggie-k enabled auto-merge (squash) June 22, 2025 14:04
@reggie-k reggie-k merged commit 614c85c into argoproj:master Jun 22, 2025
22 checks passed
reggie-k added a commit to codefresh-io/argo-cd that referenced this pull request Jun 22, 2025
reggie-k added a commit to codefresh-io/argo-cd that referenced this pull request Jun 23, 2025
* added github api metrics

Signed-off-by: reggie-k <[email protected]>

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

Signed-off-by: reggie-k <[email protected]>

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

Signed-off-by: Andrii Korotkov <[email protected]>

---------

Signed-off-by: reggie-k <[email protected]>
Signed-off-by: Andrii Korotkov <[email protected]>
Co-authored-by: Andrii Korotkov <[email protected]>
cjcocokrisp pushed a commit to cjcocokrisp/argo-cd that referenced this pull request Jun 24, 2025
enneitex pushed a commit to enneitex/argo-cd that referenced this pull request Aug 24, 2025
Mangaal pushed a commit to Mangaal/argo-cd that referenced this pull request Sep 10, 2025
ppapapetrou76 pushed a commit to codefresh-io/argo-cd that referenced this pull request Sep 16, 2025
* added github api metrics

Signed-off-by: reggie-k <[email protected]>

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

Signed-off-by: reggie-k <[email protected]>

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

Signed-off-by: Andrii Korotkov <[email protected]>

---------

Signed-off-by: reggie-k <[email protected]>
Signed-off-by: Andrii Korotkov <[email protected]>
Co-authored-by: Andrii Korotkov <[email protected]>
ppapapetrou76 added a commit to codefresh-io/argo-cd that referenced this pull request Sep 18, 2025
* chore: sync all codefresh code changes into v3.0.2 (#397)

* chore: sync all codefresh code changes into v3.0.2 without event-reporter related changes

Signed-off-by: oleksandr-codefresh <[email protected]>

* removed cf script

Signed-off-by: oleksandr-codefresh <[email protected]>

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

Signed-off-by: reggie-k <[email protected]>
Signed-off-by: oleksandr-codefresh <[email protected]>

* fixed webstorm go.mod issue

Signed-off-by: oleksandr-codefresh <[email protected]>

* e2e: improved error logs

Signed-off-by: oleksandr-codefresh <[email protected]>

* fixed changes on generated files

Signed-off-by: oleksandr-codefresh <[email protected]>

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

Signed-off-by: nitishfy <[email protected]>
Signed-off-by: Nitish Kumar <[email protected]>

(cherry picked from commit 309acd1)
Signed-off-by: oleksandr-codefresh <[email protected]>

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

Signed-off-by: oleksandr-codefresh <[email protected]>

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

Signed-off-by: oleksandr-codefresh <[email protected]>

---------

Signed-off-by: oleksandr-codefresh <[email protected]>
Signed-off-by: reggie-k <[email protected]>
Co-authored-by: Regina Voloshin <[email protected]>
Co-authored-by: Nitish Kumar <[email protected]>
# 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

* fix(validateDestination query): as we moved to argo.GetDestinationCluster, we can simply rely on error returned from this request (#405)

Signed-off-by: oleksandr-codefresh <[email protected]>

* removed curl from image (#406)

Signed-off-by: reggie-k <[email protected]>

* feat: Add GitHub API metrics (#404)

* added github api metrics

Signed-off-by: reggie-k <[email protected]>

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

Signed-off-by: reggie-k <[email protected]>

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

Signed-off-by: Andrii Korotkov <[email protected]>

---------

Signed-off-by: reggie-k <[email protected]>
Signed-off-by: Andrii Korotkov <[email protected]>
Co-authored-by: Andrii Korotkov <[email protected]>

* cherry-pick 1b48f36 Upgrade ubuntu base image to latest 25.04 digest (#407)

Signed-off-by: reggie-k <[email protected]>
Co-authored-by: dudinea <[email protected]>

* feat: CR-29912 manual cherry pick app set pr generator return 0 results if the repo does not exist (#409)

* manually added the changes

Signed-off-by: reggie-k <[email protected]>

* pull request functionality

Signed-off-by: reggie-k <[email protected]>

* pull request functionality

Signed-off-by: reggie-k <[email protected]>

---------

Signed-off-by: reggie-k <[email protected]>

* feat: move pkg/exec in-tree and add fatal timeout upgrade with SIGKILL to ARGO_EXEC_TIMEOUT (#419)

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

Signed-off-by: Michael Crenshaw <[email protected]>

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

Signed-off-by: Hazel Sudzilouski <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Co-authored-by: Alexandre Gaudreault <[email protected]>

---------

Signed-off-by: Michael Crenshaw <[email protected]>
Signed-off-by: Hazel Sudzilouski <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Co-authored-by: Michael Crenshaw <[email protected]>
Co-authored-by: Hazel Sudzilouski <[email protected]>
Co-authored-by: Alexandre Gaudreault <[email protected]>

* feat: CR-30512 stop using bitnami images (#420)

* removed references from all the images except for astra healthcheck

Signed-off-by: reggie-k <[email protected]>

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

Signed-off-by: reggie-k <[email protected]>

* reverted health check references since they are treated as text

Signed-off-by: reggie-k <[email protected]>

* reverted health check references since they are treated as text

Signed-off-by: reggie-k <[email protected]>

---------

Signed-off-by: reggie-k <[email protected]>

* chore: bumps redis to 8.x (#422)

* bumps Docker test container to redis 8

* bumps redis version to 8.2.1

Signed-off-by: Patroklos Papapetrou <[email protected]>

* use a previous version of go-redis

Signed-off-by: Patroklos Papapetrou <[email protected]>

---------

Signed-off-by: Patroklos Papapetrou <[email protected]>

* upgrade sqlite in docker image to address CVE-2025-6965 (#425)

* final changes after rebase

Signed-off-by: Patroklos Papapetrou <[email protected]>

* final changes after rebase

Signed-off-by: Patroklos Papapetrou <[email protected]>

* address new linter issues

Signed-off-by: Patroklos Papapetrou <[email protected]>

---------

Signed-off-by: oleksandr-codefresh <[email protected]>
Signed-off-by: reggie-k <[email protected]>
Signed-off-by: Andrii Korotkov <[email protected]>
Signed-off-by: Michael Crenshaw <[email protected]>
Signed-off-by: Hazel Sudzilouski <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Patroklos Papapetrou <[email protected]>
Co-authored-by: Oleksandr Saulyak <[email protected]>
Co-authored-by: Regina Voloshin <[email protected]>
Co-authored-by: Nitish Kumar <[email protected]>
Co-authored-by: Andrii Korotkov <[email protected]>
Co-authored-by: dudinea <[email protected]>
Co-authored-by: Michael Crenshaw <[email protected]>
Co-authored-by: Hazel Sudzilouski <[email protected]>
Co-authored-by: Alexandre Gaudreault <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants