Skip to content

Conversation

@crenshaw-dev
Copy link
Member

@crenshaw-dev crenshaw-dev commented Jul 2, 2025

Today repo-server clients calculate the desired Kustomize binary path based only on the Application's spec.source field.

But that causes the repo-server to ignore any overrides which are applied via the .argocd-source.yaml file.

This change deprecates the binaryPath field in repo-server and changes all internal clients to instead pass a list of versions. That allows the repo-server to calculate the desired binary path based on the App spec and any .argocd-source.yaml overrides.

This change impacts GenerateManifests and GetAppDetails in repo-server, so I've added tests for both.

Fixes #23643

@crenshaw-dev crenshaw-dev requested review from a team as code owners July 2, 2025 21:17
@bunnyshell
Copy link

bunnyshell bot commented Jul 2, 2025

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

Signed-off-by: Michael Crenshaw <[email protected]>
Signed-off-by: Michael Crenshaw <[email protected]>
Signed-off-by: Michael Crenshaw <[email protected]>
Signed-off-by: Michael Crenshaw <[email protected]>
Signed-off-by: Michael Crenshaw <[email protected]>
Signed-off-by: Michael Crenshaw <[email protected]>
Signed-off-by: Michael Crenshaw <[email protected]>
Signed-off-by: Michael Crenshaw <[email protected]>
@codecov
Copy link

codecov bot commented Jul 3, 2025

Codecov Report

❌ Patch coverage is 85.29412% with 5 lines in your changes missing coverage. Please review.
✅ Project coverage is 60.19%. Comparing base (ebff248) to head (b316fcf).
⚠️ Report is 817 commits behind head on master.

Files with missing lines Patch % Lines
util/settings/settings.go 80.00% 3 Missing and 1 partial ⚠️
util/notification/argocd/service.go 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master   #23644      +/-   ##
==========================================
+ Coverage   60.11%   60.19%   +0.08%     
==========================================
  Files         346      346              
  Lines       59304    59261      -43     
==========================================
+ Hits        35650    35675      +25     
+ Misses      20783    20729      -54     
+ Partials     2871     2857      -14     

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

type KustomizeVersionNotRegisteredError struct {
// Version is the Kustomize version that is not registered
Version string
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Why do we need a dedicated struct for this instead of using an error object for example?

Copy link
Member Author

Choose a reason for hiding this comment

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

If you use errors.Is, the error message has to be static. I want to include the version in the error message and still use errors.As, so I have to use a struct with a field.

@rumstead
Copy link
Member

I left nit picks, otherwise LGTM

crenshaw-dev and others added 2 commits July 15, 2025 13:49
Co-authored-by: rumstead <[email protected]>
Signed-off-by: Michael Crenshaw <[email protected]>
Co-authored-by: rumstead <[email protected]>
Signed-off-by: Michael Crenshaw <[email protected]>
@crenshaw-dev crenshaw-dev enabled auto-merge (squash) July 16, 2025 14:55
@crenshaw-dev crenshaw-dev merged commit 8e00df5 into argoproj:master Jul 16, 2025
27 checks passed
enneitex pushed a commit to enneitex/argo-cd that referenced this pull request Aug 24, 2025
downfa11 pushed a commit to downfa11/argo-cd that referenced this pull request Aug 25, 2025
Mangaal pushed a commit to Mangaal/argo-cd that referenced this pull request Sep 10, 2025
downfa11 pushed a commit to downfa11/argo-cd that referenced this pull request Sep 12, 2025
sivasath16 pushed a commit to sivasath16/argo-cd that referenced this pull request Sep 17, 2025
sivasath16 pushed a commit to sivasath16/argo-cd that referenced this pull request Sep 17, 2025
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.

Kustomize version in .argocd-source.yaml is ignored

3 participants