fix: force_conflicts by default for crds managed by server side apply

Signed-off-by: Kevin Lefevre <[email protected]>
particuleio · Feb 13, 2023 · a88a532 · a88a532
1 parent bbe3745
commit a88a532
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/kong-crds.tf b/kong-crds.tf
@@ -25,4 +25,5 @@ resource "kubectl_manifest" "kong_crds" {
   for_each          = local.kong.enabled && local.kong.manage_crds ? { for v in local.kong_crds_apply : lower(join("/", compact([v.data.apiVersion, v.data.kind, lookup(v.data.metadata, "namespace", ""), v.data.metadata.name]))) => v.content } : {}
   yaml_body         = each.value
   server_side_apply = true
+  force_conflicts   = true
 }
diff --git a/kube-prometheus-crd.tf b/kube-prometheus-crd.tf
@@ -34,4 +34,5 @@ resource "kubectl_manifest" "prometheus-operator_crds" {
   for_each          = (local.victoria-metrics-k8s-stack.enabled && local.victoria-metrics-k8s-stack.install_prometheus_operator_crds) || (local.kube-prometheus-stack.enabled && local.kube-prometheus-stack.manage_crds) ? local.prometheus-operator_crds_apply : {}
   yaml_body         = each.value
   server_side_apply = true
+  force_conflicts   = true
 }