From 19e056beeb3773f3d2688673c6c2f426a647b437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20W=C3=BCrbach?= <johannes.wuerbach@googlemail.com>
Date: Fri, 28 Jun 2024 14:42:51 +0200
Subject: [PATCH] fix: allow k8s to force state

---
 modules/cd-argocd/argocd.tf | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/cd-argocd/argocd.tf b/modules/cd-argocd/argocd.tf
index 9c74a3c..6c85283 100644
--- 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,
   ]