Skip to content

chore: replace heptio-images with argocd-e2e-container#23040

Merged
rumstead merged 2 commits intoargoproj:masterfrom
nitishfy:replace-image
May 19, 2025
Merged

chore: replace heptio-images with argocd-e2e-container#23040
rumstead merged 2 commits intoargoproj:masterfrom
nitishfy:replace-image

Conversation

@nitishfy
Copy link
Member

@nitishfy nitishfy commented May 19, 2025

PR to replace heptio-images with argocd-e2e-container image that is widely used in the project either for example application, installation purpose etc.

Related to

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: nitishfy <justnitish06@gmail.com>
@nitishfy nitishfy requested review from a team as code owners May 19, 2025 14:05
@bunnyshell
Copy link

bunnyshell bot commented May 19, 2025

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

Signed-off-by: Nitish Kumar <justnitish06@gmail.com>
@codecov
Copy link

codecov bot commented May 19, 2025

Codecov Report

❌ Patch coverage is 50.00000% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 60.02%. Comparing base (90408cb) to head (3ad7a23).
⚠️ Report is 461 commits behind head on master.

Files with missing lines Patch % Lines
cmd/argocd/commands/admin/app.go 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master   #23040      +/-   ##
==========================================
- Coverage   60.02%   60.02%   -0.01%     
==========================================
  Files         343      343              
  Lines       57846    57846              
==========================================
- Hits        34723    34721       -2     
- Misses      20353    20355       +2     
  Partials     2770     2770              

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

@rumstead rumstead merged commit 309acd1 into argoproj:master May 19, 2025
28 checks passed
@nitishfy nitishfy deleted the replace-image branch May 19, 2025 15:06
@nitishfy
Copy link
Member Author

/cherry-pick 2.14

@nitishfy
Copy link
Member Author

/cherry-pick release-2.14

@gcp-cherry-pick-bot
Copy link

Cherry-pick failed with Merge error 309acd161c7cf20e99970f06d04efc4eb78a00a9 into temp-cherry-pick-320975-release-2.14

@nitishfy
Copy link
Member Author

/cherry-pick release-3.0

@gcp-cherry-pick-bot
Copy link

Cherry-pick failed with Merge error 309acd161c7cf20e99970f06d04efc4eb78a00a9 into temp-cherry-pick-320975-release-3.0

@nitishfy
Copy link
Member Author

nitishfy commented May 19, 2025

/cherry-pick release-2.13

@gcp-cherry-pick-bot
Copy link

Cherry-pick failed with Merge error 309acd161c7cf20e99970f06d04efc4eb78a00a9 into temp-cherry-pick-320975-release-3.0

@gcp-cherry-pick-bot
Copy link

Cherry-pick failed with Merge error 309acd161c7cf20e99970f06d04efc4eb78a00a9 into temp-cherry-pick-320975-release-2.13

@nitishfy
Copy link
Member Author

/cherry-pick release-3.0

@nitishfy
Copy link
Member Author

/cherry-pick release-2.13

nitishfy added a commit to nitishfy/argo-cd that referenced this pull request May 20, 2025
Signed-off-by: nitishfy <justnitish06@gmail.com>
Signed-off-by: Nitish Kumar <justnitish06@gmail.com>
(cherry picked from commit 309acd1)
ranakan19 pushed a commit to ranakan19/argo-cd that referenced this pull request May 20, 2025
Signed-off-by: nitishfy <justnitish06@gmail.com>
Signed-off-by: Nitish Kumar <justnitish06@gmail.com>
Signed-off-by: Kanika Rana <krana@redhat.com>
nitishfy added a commit to nitishfy/argo-cd that referenced this pull request May 20, 2025
Signed-off-by: nitishfy <justnitish06@gmail.com>
Signed-off-by: Nitish Kumar <justnitish06@gmail.com>
olivergondza pushed a commit to olivergondza/argo-cd that referenced this pull request May 20, 2025
Signed-off-by: nitishfy <justnitish06@gmail.com>
Signed-off-by: Nitish Kumar <justnitish06@gmail.com>
Signed-off-by: Oliver Gondža <ogondza@gmail.com>
nitishfy added a commit to nitishfy/argo-cd that referenced this pull request May 20, 2025
Signed-off-by: nitishfy <justnitish06@gmail.com>
Signed-off-by: Nitish Kumar <justnitish06@gmail.com>
oleksandr-codefresh pushed a commit to codefresh-io/argo-cd that referenced this pull request May 20, 2025
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>
nitishfy added a commit to nitishfy/argo-cd that referenced this pull request May 20, 2025
Signed-off-by: nitishfy <justnitish06@gmail.com>
Signed-off-by: Nitish Kumar <justnitish06@gmail.com>
oleksandr-codefresh added a commit to codefresh-io/argo-cd that referenced this pull request May 20, 2025
* 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>
LyhengTep pushed a commit to LyhengTep/argo-cd that referenced this pull request May 24, 2025
Signed-off-by: nitishfy <justnitish06@gmail.com>
Signed-off-by: Nitish Kumar <justnitish06@gmail.com>
Signed-off-by: Lyheng <lyhengtep@gmail.com>
reggie-k pushed a commit that referenced this pull request May 27, 2025
tylerrosnett pushed a commit to StateFarmIns/argo-cd that referenced this pull request May 27, 2025
Signed-off-by: nitishfy <justnitish06@gmail.com>
Signed-off-by: Nitish Kumar <justnitish06@gmail.com>
reggie-k pushed a commit that referenced this pull request Jun 3, 2025
…23040) (#23058)

Signed-off-by: nitishfy <justnitish06@gmail.com>
Signed-off-by: Nitish Kumar <justnitish06@gmail.com>
chansuke pushed a commit to chansuke/argo-cd that referenced this pull request Jun 4, 2025
Signed-off-by: nitishfy <justnitish06@gmail.com>
Signed-off-by: Nitish Kumar <justnitish06@gmail.com>
dsuhinin pushed a commit to dsuhinin/argo-cd that referenced this pull request Jun 16, 2025
Signed-off-by: nitishfy <justnitish06@gmail.com>
Signed-off-by: Nitish Kumar <justnitish06@gmail.com>
Signed-off-by: dsuhinin <suhinin.dmitriy@gmail.com>
dsuhinin pushed a commit to dsuhinin/argo-cd that referenced this pull request Jun 16, 2025
Signed-off-by: nitishfy <justnitish06@gmail.com>
Signed-off-by: Nitish Kumar <justnitish06@gmail.com>
Signed-off-by: dsuhinin <suhinin.dmitriy@gmail.com>
ppapapetrou76 pushed a commit to codefresh-io/argo-cd that referenced this pull request Sep 16, 2025
* 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
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.

3 participants