[preview] diff-apply server side force conflicts

vulkoingim · filiptronicek · commit a0468cacbf62 · 2023-03-17T14:42:31.000Z
diff --git a/dev/preview/workflow/lib/k8s-util.sh b/dev/preview/workflow/lib/k8s-util.sh
@@ -96,6 +96,6 @@ function diff-apply {
   if kubectl --context "${context}" diff -f "${yaml}" > /dev/null; then
     echo "Skipping ${yaml}, as it produced no diff"
   else
-    kubectl --context "${context}" apply --server-side -f "${yaml}"
+    kubectl --context "${context}" apply --server-side --force-conflicts -f "${yaml}"
   fi
 }

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,6 @@ function diff-apply {`
`96`	`96`	`if kubectl --context "${context}" diff -f "${yaml}" > /dev/null; then`
`97`	`97`	`echo "Skipping ${yaml}, as it produced no diff"`
`98`	`98`	`else`
`99`		`- kubectl --context "${context}" apply --server-side -f "${yaml}"`
	`99`	`+ kubectl --context "${context}" apply --server-side --force-conflicts -f "${yaml}"`
`100`	`100`	`fi`
`101`	`101`	`}`