env

bootstrap.sh

@@ -37,6 +37,10 @@ Gitea()
 ############################################################
 ArgoCd()
 {
+    # Pre-create ConfigMap for repo-server env (must exist before Helm upgrade)
+    kubectl create namespace argocd --dry-run=client -o yaml | kubectl apply -f -
+    kubectl apply -f cluster-resources/argocd-repo-server-config.yaml
+
     # install argocd
     echo "Installing ArgoCD..."
     helm upgrade --install argocd argo-cd \

cluster-resources/argocd-repo-server-config.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: argocd-repo-server-config
+  namespace: argocd
+data:
+  # Disable git submodule checkout - submodules (e.g. shared-prompts)
+  # are not needed for K8s manifest generation
+  ARGOCD_GIT_MODULES_ENABLED: "false"

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

infra/values/base/argocd-values.yaml

@@ -27,14 +27,14 @@ configs:
   params:
     "server.insecure": true
 repoServer:
-  # Disable git submodule checkout - submodules (e.g. shared-prompts)
-  # are not needed for K8s manifest generation
+  # Disable git submodule checkout via ConfigMap envFrom
+  # (using env: causes strategic merge conflict with chart's valueFrom entries)
   env:
-  - name: ARGOCD_GIT_MODULES_ENABLED
-    value: "false"
+  - configMapRef:
+      name: argocd-repo-server-config
 server:
   ingress:
-    enabled: true
+    enabled: false
     ingressClassName: traefik
     annotations:
       cert-manager.io/cluster-issuer: letsencrypt-prod