Skip to content

Commit 5846916

Browse files
committed
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.
1 parent 10cb6b9 commit 5846916

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

content/en/docs/reference/using-api/server-side-apply.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ this occurs, the applier has 3 options to resolve the conflicts:
125125

126126
* **Overwrite value, become sole manager:** If overwriting the value was
127127
intentional (or if the applier is an automated process like a controller) the
128-
applier should set the `force` query parameter to true and make the request
128+
applier should add `--force-conflicts` to `kubectl apply` or set
129+
the `force` query parameter to true and make the request
129130
again. This forces the operation to succeed, changes the value of the field,
130131
and removes the field from all other managers' entries in managedFields.
131132

0 commit comments

Comments
 (0)