autocommit

argocd-app-projects/main.yaml

@@ -15,8 +15,6 @@ spec:
   syncPolicy:
     automated:
       selfHeal: false
-  syncOptions:
-    - CreateNamespace=true
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Application
@@ -34,6 +32,4 @@ spec:
     namespace: argocd
   syncPolicy:
     automated:
-      selfHeal: false
-  syncOptions:
-    - CreateNamespace=true
+      selfHeal: false

helm/argocd/values.yaml

@@ -8,7 +8,7 @@ nameOverride: ""
 fullnameOverride: ""
 # -- Override the namespace
 # @default -- `.Release.Namespace`
-namespaceOverride: ""
+namespaceOverride: "argocd"
 # -- Override the Kubernetes version, which is used to evaluate certain manifests
 kubeVersionOverride: ""
 # Override APIVersions
@@ -36,6 +36,7 @@ crds:
   # -- Annotations to be added to all CRDs
   annotations:
     argocd.argoproj.io/sync-options: ServerSideApply=true
+    meta.helm.sh/release-namespace: argocd
   # -- Additional labels to be added to all CRDs
   additionalLabels: {}