fix(repo-server): support .argocd-source.yaml kustomize version (#23643)

controller/state.go

@@ -236,10 +236,6 @@ func (m *appStateManager) GetRepoObjs(app *v1alpha1.Application, sources []v1alp
 		if err != nil {
 			return nil, nil, false, fmt.Errorf("failed to get repo %q: %w", source.RepoURL, err)
 		}
-		kustomizeOptions, err := kustomizeSettings.GetOptions(source)
-		if err != nil {
-			return nil, nil, false, fmt.Errorf("failed to get Kustomize options for source %d of %d: %w", i+1, len(sources), err)
-		}
 
 		syncedRevision := app.Status.Sync.Revision
 		if app.Spec.HasMultipleSources() {
@@ -316,7 +312,7 @@ func (m *appStateManager) GetRepoObjs(app *v1alpha1.Application, sources []v1alp
 			AppName:                         app.InstanceName(m.namespace),
 			Namespace:                       appNamespace,
 			ApplicationSource:               &source,
-			KustomizeOptions:                kustomizeOptions,
+			KustomizeOptions:                kustomizeSettings,
 			KubeVersion:                     serverVersion,
 			ApiVersions:                     apiVersions,
 			VerifySignature:                 verifySignature,

docs/operator-manual/upgrading/3.1-3.2.md

@@ -0,0 +1,39 @@
+# v3.1 to 3.2
+
+## Argo CD Now Respects Kustomize Version in `.argocd-source.yaml`
+
+Argo CD provides a way to [override Application `spec.source` values](../../user-guide/parameters.md#store-overrides-in-git) 
+using the `.argocd-source.yaml` file.
+
+Before Argo CD v3.2, you could set the Kustomize version in the Application's `.spec.source.kustomize.version` field,
+but you could not set it in the `.argocd-source.yaml` file.
+
+Starting with Argo CD v3.2, you can now set the Kustomize version in the `.argocd-source.yaml` file like this:
+
+```yaml
+kustomize:
+  version: v4.5.7
+```
+
+## Deprecated fields in the repo-server GRPC service
+
+The repo-server's GRPC service is generally considered an internal API and is not recommended for use by external 
+clients. No user-facing services or functionality have changed. However, if you are using the repo-server's GRPC service 
+directly, please note field deprecations in the following messages.
+
+The `kustomizeOptions.binaryPath` field in the `ManifestRequest` and `RepoServerAppDetailsQuery` messages has been 
+deprecated. Instead of calculating the correct binary path client-side, the client is expected to populate the 
+`kustomizeOptions.versions` field with the [configured Kustomize binary paths](../../user-guide/kustomize.md#custom-kustomize-versions). 
+This allows the repo-server to select the correct binary path based on the Kustomize version configured in the 
+Application's source field as well as any [overrides configured via git](../../user-guide/parameters.md#store-overrides-in-git).
+
+The `kustomizeOptions.binaryPath` will continue to be respected when `kustomizeOptions.versions` is not set, but this is
+not recommended. It will prevent overrides configured via git from being respected. The `kustomizeOptions.binaryPath` 
+field will be removed in a future release.
+
+If the repo-server encounters a request with the `kustomizeOptions.binaryPath` field set, it will log a warning message:
+
+> kustomizeOptions.binaryPath is deprecated, use KustomizeOptions.versions instead
+
+The `ManifestRequest` and `RepoServerAppDetailsQuery` messages are used by the following GRPC services: 
+`GenerateManifest`, `GenerateManifestWithFiles`, and `GetAppDetails`.

docs/operator-manual/upgrading/overview.md

@@ -38,6 +38,7 @@ kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/<v
 
 <hr/>
 
+- [v3.1 to v3.2](./3.1-3.2.md)
 - [v3.0 to v3.1](./3.0-3.1.md)
 - [v2.14 to v3.0](./2.14-3.0.md)
 - [v2.13 to v2.14](./2.13-2.14.md)

mkdocs.yml

@@ -131,6 +131,7 @@ nav:
     - operator-manual/server-commands/additional-configuration-method.md
   - Upgrading:
     - operator-manual/upgrading/overview.md
+    - operator-manual/upgrading/3.1-3.2.md
     - operator-manual/upgrading/3.0-3.1.md
     - operator-manual/upgrading/2.14-3.0.md
     - operator-manual/upgrading/2.13-2.14.md