Merge pull request #4 from humanitec-architecture/force-state

fix: allow k8s to force state
humanitec-architecture · Aug 21, 2024 · 99add65 · 99add65
2 parents 3801706 + 19e056b
commit 99add65
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/modules/cd-argocd/argocd.tf b/modules/cd-argocd/argocd.tf
@@ -50,6 +50,10 @@ resource "kubernetes_manifest" "argocd_instance" {
     REPO_CREDENTIALS_SECRET = local.argocd_manifests_repo_credentials_secret_name,
   }))
 
+  field_manager {
+    force_conflicts = true
+  }
+
   depends_on = [
     kubernetes_secret_v1.argocd_manifests_repo_credentials,
     time_sleep.argocd_operator_ready,
@@ -70,6 +74,10 @@ resource "kubernetes_manifest" "argocd_applicationset" {
     REPO_URL  = local.git_url,
   }))
 
+  field_manager {
+    force_conflicts = true
+  }
+
   depends_on = [
     time_sleep.argocd_instance_ready,
   ]