Skip to content

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

Merged
crenshaw-dev merged 3 commits intoargoproj:masterfrom
crenshaw-dev:pkg-exec
Mar 24, 2025
Merged

chore: move pkg/exec in-tree (#22175)#22460
crenshaw-dev merged 3 commits intoargoproj:masterfrom
crenshaw-dev:pkg-exec

Conversation

@crenshaw-dev
Copy link
Member

@crenshaw-dev crenshaw-dev commented Mar 24, 2025

Argo CD is the only Argo project which uses argoproj/pkg's exec package. Moving it in-tree for #22175

Related: #22175

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@crenshaw-dev crenshaw-dev requested a review from a team as a code owner March 24, 2025 14:34
@bunnyshell
Copy link

bunnyshell bot commented Mar 24, 2025

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

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

codecov bot commented Mar 24, 2025

Codecov Report

Attention: Patch coverage is 85.85859% with 14 lines in your changes missing coverage. Please review.

Please upload report for BASE (master@d171179). Learn more about missing BASE report.
Report is 443 commits behind head on master.

Files with missing lines Patch % Lines
util/exec/exec.go 88.04% 8 Missing and 3 partials ⚠️
util/rand/rand.go 50.00% 2 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff            @@
##             master   #22460   +/-   ##
=========================================
  Coverage          ?   55.99%           
=========================================
  Files             ?      343           
  Lines             ?    57429           
  Branches          ?        0           
=========================================
  Hits              ?    32159           
  Misses            ?    22625           
  Partials          ?     2645           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

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

@rumstead rumstead left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving the files in LGTM

@crenshaw-dev crenshaw-dev merged commit d2da1b3 into argoproj:master Mar 24, 2025
27 checks passed
Hapshanko pushed a commit to Hapshanko/argo-cd that referenced this pull request Apr 29, 2025
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Signed-off-by: Hapshanko <adamgaming391100@gmail.com>
reggie-k pushed a commit to codefresh-io/argo-cd that referenced this pull request Jul 28, 2025
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
reggie-k added a commit to codefresh-io/argo-cd that referenced this pull request Aug 5, 2025
…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>
ppapapetrou76 pushed a commit to codefresh-io/argo-cd that referenced this pull request Sep 16, 2025
…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>
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 <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

* 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 <oleksandr.saulyak@octopus.com>

* removed curl from image (#406)

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

* feat: Add GitHub API metrics (#404)

* 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>

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

Signed-off-by: reggie-k <regina.voloshin@codefresh.io>
Co-authored-by: dudinea <eugene.doudine@octopus.com>

* 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 <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>

* 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 <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>

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

* 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>

* 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 <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>

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

* final changes after rebase

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

* final changes after rebase

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

* address new linter issues

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

---------

Signed-off-by: oleksandr-codefresh <oleksandr.saulyak@octopus.com>
Signed-off-by: reggie-k <regina.voloshin@codefresh.io>
Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.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>
Signed-off-by: Patroklos Papapetrou <ppapapetrou76@gmail.com>
Co-authored-by: Oleksandr Saulyak <oleksandr.saulyak@octopus.com>
Co-authored-by: Regina Voloshin <regina.voloshin@codefresh.io>
Co-authored-by: Nitish Kumar <justnitish06@gmail.com>
Co-authored-by: Andrii Korotkov <137232734+andrii-korotkov-verkada@users.noreply.github.com>
Co-authored-by: dudinea <eugene.doudine@octopus.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>
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