Add force_conflicts true for custom resource HorizontalRunnerAutoscaler (#28)

niroz89 · web-flow · commit 4f90212d6a02 · 2024-03-11T17:55:13.000+08:00
Add force_conflicts true for custom resource
diff --git a/ent_runners.tf b/ent_runners.tf
@@ -115,6 +115,10 @@ resource "kubernetes_manifest" "github_ent_runners_horizontal_autoscaler" {
     }
   }
 
+  field_manager {
+    force_conflicts = true
+  }
+
   depends_on = [
     helm_release.release
   ]
diff --git a/ent_runners_dind.tf b/ent_runners_dind.tf
@@ -114,6 +114,10 @@ resource "kubernetes_manifest" "github_ent_runners_horizontal_autoscaler_dind" {
     }
   }
 
+  field_manager {
+    force_conflicts = true
+  }
+
   depends_on = [
     helm_release.release
   ]
diff --git a/ent_runners_dind_rootless.tf b/ent_runners_dind_rootless.tf
@@ -114,6 +114,10 @@ resource "kubernetes_manifest" "github_ent_runners_horizontal_autoscaler_dind_ro
     }
   }
 
+  field_manager {
+    force_conflicts = true
+  }
+
   depends_on = [
     helm_release.release
   ]

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,10 @@ resource "kubernetes_manifest" "github_ent_runners_horizontal_autoscaler" {`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
	`118`	`+ field_manager {`
	`119`	`+ force_conflicts = true`
	`120`	`+ }`
	`121`	`+`
`118`	`122`	`depends_on = [`
`119`	`123`	`helm_release.release`
`120`	`124`	`]`
Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,10 @@ resource "kubernetes_manifest" "github_ent_runners_horizontal_autoscaler_dind" {`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
	`117`	`+ field_manager {`
	`118`	`+ force_conflicts = true`
	`119`	`+ }`
	`120`	`+`
`117`	`121`	`depends_on = [`
`118`	`122`	`helm_release.release`
`119`	`123`	`]`