env

docs/REFERENCE.md

@@ -657,14 +657,24 @@ retry:
 | `admin.enabled` | `true` | Enable admin account |
 | `url` | `https://argocd.forteapps.net` | External URL for ArgoCD UI |
 
-**Git Submodule Disable**: Set via `repoServer.env` (not `configs.cm`):
+**Git Submodule Disable**: Set via ConfigMap + `repoServer.envFrom` (NOT `repoServer.env` — that causes strategic merge conflicts with chart's `valueFrom` entries):
 ```yaml
+# cluster-resources/argocd-repo-server-config.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: argocd-repo-server-config
+  namespace: argocd
+data:
+  ARGOCD_GIT_MODULES_ENABLED: "false"
+
+# argocd-values.yaml
 repoServer:
-  env:
-  - name: ARGOCD_GIT_MODULES_ENABLED
-    value: "false"
+  envFrom:
+  - configMapRef:
+      name: argocd-repo-server-config
 ```
-Submodules (e.g., `shared-prompts`) are not needed for K8s manifest generation.
+The ConfigMap is applied by `bootstrap.sh` before `helm upgrade`. Submodules (e.g., `shared-prompts`) are not needed for K8s manifest generation.
 
 **OIDC Authentication** (Keycloak):
 ```yaml