Skip to content

chore: replace heptio-images with argocd-e2e-container (cherry-pick #23040) #23058

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
merged 4 commits into from
Jun 3, 2025
Merged

chore: replace heptio-images with argocd-e2e-container (cherry-pick #23040) #23058

merged 4 commits into from
Jun 3, 2025
+87 −86

Conversation

nitishfy
Copy link
Member

Cherry-pick #23040

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

@nitishfy nitishfy requested review from a team as code owners May 20, 2025 10:35
@reggie-k
Copy link
Member

Thanks @nitishfy! Any reason for using different container argoprojlabs/argocd-e2e-container tags? (0.2, 0.1 and unpinned)

@nitishfy
chore: replace heptio-images with argocd-e2e-container (argoproj#23040)
509afb0 
Signed-off-by: nitishfy <justnitish06@gmail.com>
Signed-off-by: Nitish Kumar <justnitish06@gmail.com>
@nitishfy nitishfy force-pushed the images-cherry-pick-3.0 branch from dc2ec57 to 509afb0 Compare May 20, 2025 12:44
@nitishfy
replace images
02e4501 
Signed-off-by: nitishfy <justnitish06@gmail.com>
@nitishfy
Copy link
Member Author

Thanks @nitishfy! Any reason for using different container argoprojlabs/argocd-e2e-container tags? (0.2, 0.1 and unpinned)

Can you refer the line that you're refering to?

reggie-k
reggie-k reviewed May 20, 2025
View reviewed changes
Copy link
Member

@reggie-k reggie-k left a comment

Choose a reason for hiding this comment

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

Pointed out some lines, but didn't go through every single one.

.../examples/git-generator-directory/excludes/cluster-addons/exclude-helm-guestbook/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1

image:
repository: gcr.io/heptio-images/ks-guestbook-demo
repository: quay.io/argoprojlabs/argocd-e2e-container
Copy link
Member

Choose a reason for hiding this comment

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

Here the argocd-e2e-container image is used without a tag

Copy link
Member Author

Choose a reason for hiding this comment

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

the tag field is mentioned below. Please see this.

controller/testdata/live-deployment-env-vars.yaml
@@ -6,7 +6,7 @@ metadata:
deployment.kubernetes.io/revision: '9'
iksm-version: '2.0'
kubectl.kubernetes.io/last-applied-configuration: >
{"apiVersion":"apps/v1","kind":"Deployment","metadata":{"annotations":{"argocd.argoproj.io/tracking-id":"guestbook:apps/Deployment:default/kustomize-guestbook-ui","iksm-version":"2.0"},"name":"kustomize-guestbook-ui","namespace":"default"},"spec":{"replicas":4,"revisionHistoryLimit":3,"selector":{"matchLabels":{"app":"guestbook-ui"}},"template":{"metadata":{"labels":{"app":"guestbook-ui"}},"spec":{"containers":[{"env":[{"name":"SOME_ENV_VAR","value":"some_value"}],"image":"gcr.io/heptio-images/ks-guestbook-demo:0.1","name":"guestbook-ui","ports":[{"containerPort":80}],"resources":{"requests":{"cpu":"50m","memory":"100Mi"}}}]}}}}
{"apiVersion":"apps/v1","kind":"Deployment","metadata":{"annotations":{"argocd.argoproj.io/tracking-id":"guestbook:apps/Deployment:default/kustomize-guestbook-ui","iksm-version":"2.0"},"name":"kustomize-guestbook-ui","namespace":"default"},"spec":{"replicas":4,"revisionHistoryLimit":3,"selector":{"matchLabels":{"app":"guestbook-ui"}},"template":{"metadata":{"labels":{"app":"guestbook-ui"}},"spec":{"containers":[{"env":[{"name":"SOME_ENV_VAR","value":"some_value"}],"image":"quay.io/argoprojlabs/argocd-e2e-container:0.1","name":"guestbook-ui","ports":[{"containerPort":80}],"resources":{"requests":{"cpu":"50m","memory":"100Mi"}}}]}}}}
Copy link
Member

Choose a reason for hiding this comment

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

Here the argocd-e2e-container image is used with a 0.1 tag

controller/testdata/live-deployment-env-vars.yaml
@@ -137,7 +137,7 @@ spec:
- env:
- name: SOME_ENV_VAR
value: some_value
image: 'gcr.io/heptio-images/ks-guestbook-demo:0.1'
image: 'quay.io/argoprojlabs/argocd-e2e-container:0.1'
Copy link
Member

Choose a reason for hiding this comment

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

Here the argocd-e2e-container image is used with a 0.1 tag

Copy link
Member Author

Choose a reason for hiding this comment

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

these are by default.

...t/examples/applications-sync-policies/guestbook/engineering-dev/guestbook-ui-deployment.yaml
@@ -14,7 +14,7 @@ spec:
app: guestbook-ui
spec:
containers:
- image: gcr.io/heptio-images/ks-guestbook-demo:0.2
- image: quay.io/argoprojlabs/argocd-e2e-container:0.2
Copy link
Member

Choose a reason for hiding this comment

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

Here the argocd-e2e-container image is used with a 0.2 tag

Copy link
Member

Choose a reason for hiding this comment

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

i dont think we should be changing the tag version. they were running a different tag before as part of the e2e. i would assume they were set intentionally?

nitishfy added 2 commits May 20, 2025 18:39
@nitishfy
fix unit test
e114b98 
Signed-off-by: nitishfy <justnitish06@gmail.com>
@nitishfy
Merge branch 'release-3.0' into images-cherry-pick-3.0
773878e
@codecov Codecov
Copy link

codecov bot commented May 27, 2025 •
edited
Loading

Codecov Report

❌ Patch coverage is 0% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 55.83%. Comparing base (c27a9d3) to head (773878e).
⚠️ Report is 49 commits behind head on release-3.0.

Files with missing lines Patch % Lines
cmd/argocd/commands/admin/app.go 0.00% 1 Missing ⚠️
cmd/argocd/commands/app.go 0.00% 1 Missing ⚠️
Additional details and impacted files 
@@               Coverage Diff               @@
##           release-3.0   #23058      +/-   ##
===============================================
- Coverage        55.93%   55.83%   -0.11%     
===============================================
  Files              343      343              
  Lines            57387    57387              
===============================================
- Hits             32102    32040      -62     
- Misses           22643    22685      +42     
- Partials          2642     2662      +20

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

@reggie-k reggie-k merged commit 001848e into argoproj:release-3.0 Jun 3, 2025
21 of 22 checks passed
@nitishfy nitishfy deleted the images-cherry-pick-3.0 branch June 3, 2025 06:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@reggie-k reggie-k reggie-k approved these changes

@rumstead rumstead rumstead 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.
3 participants
@nitishfy @reggie-k @rumstead