From 5846916395014e7e318b1af85ec0b351d11d5daa Mon Sep 17 00:00:00 2001 From: David Xia Date: Tue, 24 May 2022 17:32:12 -0400 Subject: [PATCH] docs: show server side apply overwrite for CLI Docs currently say how to do it with HTTP request. This addition will help `kubectl` users as well. --- content/en/docs/reference/using-api/server-side-apply.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/en/docs/reference/using-api/server-side-apply.md b/content/en/docs/reference/using-api/server-side-apply.md index 6b932278dc..cb53568f13 100644 --- a/content/en/docs/reference/using-api/server-side-apply.md +++ b/content/en/docs/reference/using-api/server-side-apply.md @@ -125,7 +125,8 @@ this occurs, the applier has 3 options to resolve the conflicts: * **Overwrite value, become sole manager:** If overwriting the value was intentional (or if the applier is an automated process like a controller) the - applier should set the `force` query parameter to true and make the request + applier should add `--force-conflicts` to `kubectl apply` or set + the `force` query parameter to true and make the request again. This forces the operation to succeed, changes the value of the field, and removes the field from all other managers' entries in managedFields.