Skip to content

fix(repo-server): When using custom kustomize versions, obtain the correct path (#21449) #21537

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

fix(repo-server): When using custom kustomize versions, obtain the correct path (#21449) #21537

agaudreault merged 3 commits into from
May 7, 2025

Conversation

@Asuforce
Copy link
Contributor

@Asuforce Asuforce commented Jan 17, 2025

Fixes #21449

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

@Asuforce Asuforce requested a review from a team as a code owner January 17, 2025 07:16
@bunnyshell
Copy link

bunnyshell bot commented Jan 17, 2025 •
edited
Loading

❗ Preview Environment undeploy from Bunnyshell failed

See: Environment Details | Pipeline Logs

Available commands (reply to this comment):

  • 🚀 /bns:deploy to redeploy the environment
  • ❌ /bns:delete to try again to remove the environment

@Asuforce Asuforce force-pushed the bugfix/helm-option-with-kustomize branch from c489fed to 4584f4f Compare January 17, 2025 07:30
@codecov
Copy link

codecov bot commented Jan 17, 2025 •
edited
Loading

Codecov Report

❌ Patch coverage is 78.57143% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 55.96%. Comparing base (faf0073) to head (497d395).
⚠️ Report is 560 commits behind head on master.

Files with missing lines Patch % Lines
util/kustomize/kustomize.go 78.57% 0 Missing and 3 partials ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##           master   #21537      +/-   ##
==========================================
- Coverage   55.99%   55.96%   -0.03%     
==========================================
  Files         343      343              
  Lines       57536    57539       +3     
==========================================
- Hits        32219    32204      -15     
- Misses      22668    22676       +8     
- Partials     2649     2659      +10

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

@crenshaw-dev crenshaw-dev changed the title fix: When using custom kustomize versions, obtain the correct path #21449 fix(repo-server): When using custom kustomize versions, obtain the correct path (#21449) Jan 17, 2025
@nitishfy nitishfy self-assigned this Jan 17, 2025
@Asuforce Asuforce force-pushed the bugfix/helm-option-with-kustomize branch from 4584f4f to 47bc1be Compare January 29, 2025 05:23
@Asuforce
Copy link
Contributor Author

Asuforce commented Jan 29, 2025

@nitishfy I fixed conflict. Could you review it?

@andrii-korotkov-verkada andrii-korotkov-verkada added the ready-for-review An approver should give a final review and merge the PR label Feb 26, 2025
rumstead
rumstead reviewed Feb 26, 2025
View reviewed changes
util/kustomize/kustomize.go

func versionWithBinaryPath(k *kustomize) (string, error) {
executable := k.getBinaryPath()
cmd := exec.Command(executable, "version", "--short")
Copy link
Member

@rumstead rumstead Feb 26, 2025

Choose a reason for hiding this comment

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

--short has been deprecated, should we move it? It also makes parsing the version way easier now.

Copy link
Contributor Author

@Asuforce Asuforce Feb 27, 2025

Choose a reason for hiding this comment

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

@rumstead I understand your point, but this is outside the scope of this PR. It should be addressed in a separate PR.

@agaudreault agaudreault merged commit c7fa14e into argoproj:master May 7, 2025
27 checks passed
@github-project-automation github-project-automation bot moved this from Ready for final review to Done in Argo CD Review May 7, 2025
LyhengTep pushed a commit to LyhengTep/argo-cd that referenced this pull request May 10, 2025
@Asuforce @LyhengTep
fix(repo-server): When using custom kustomize versions, obtain the co…
f26e512 
…rrect path (argoproj#21449) (argoproj#21537)

Signed-off-by: asuforce <[email protected]>
ranakan19 pushed a commit to ranakan19/argo-cd that referenced this pull request May 20, 2025
@Asuforce @ranakan19
fix(repo-server): When using custom kustomize versions, obtain the co…
b688411 
…rrect path (argoproj#21449) (argoproj#21537)

Signed-off-by: asuforce <[email protected]>
Signed-off-by: Kanika Rana <[email protected]>
@Asuforce Asuforce deleted the bugfix/helm-option-with-kustomize branch May 20, 2025 09:27
olivergondza pushed a commit to olivergondza/argo-cd that referenced this pull request May 20, 2025
@Asuforce @olivergondza
fix(repo-server): When using custom kustomize versions, obtain the co…
eb9c011 
…rrect path (argoproj#21449) (argoproj#21537)

Signed-off-by: asuforce <[email protected]>
Signed-off-by: Oliver Gondža <[email protected]>
tylerrosnett pushed a commit to StateFarmIns/argo-cd that referenced this pull request May 27, 2025
@Asuforce @tylerrosnett
fix(repo-server): When using custom kustomize versions, obtain the co…
bc88b03 
…rrect path (argoproj#21449) (argoproj#21537)

Signed-off-by: asuforce <[email protected]>
chansuke pushed a commit to chansuke/argo-cd that referenced this pull request Jun 4, 2025
@Asuforce @chansuke
fix(repo-server): When using custom kustomize versions, obtain the co…
1fbc2d7 
…rrect path (argoproj#21449) (argoproj#21537)

Signed-off-by: asuforce <[email protected]>
@devstein devstein mentioned this pull request Aug 15, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rumstead rumstead rumstead left review comments

@agaudreault agaudreault agaudreault approved these changes

+1 more reviewer

@andrii-korotkov-verkada andrii-korotkov-verkada andrii-korotkov-verkada approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

ready-for-review An approver should give a final review and merge the PR

Projects

Argo CD Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Error with Kustomize with --enable-helm option

5 participants

@Asuforce @rumstead @agaudreault @andrii-korotkov-verkada @nitishfy