kubernetes
/
website
mirror of https://github.com/kubernetes/website.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Co-authored-by: Antoine Pelisse <apelisse@gmail.com>
This commit is contained in:
David Xia 2022-05-24 19:19:27 -04:00 committed by GitHub
parent 5846916395
commit 69d46a7a98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,8 +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 add `--force-conflicts` to `kubectl apply` or set
the `force` query parameter to true and make the request
applier should set the `force` query parameter to true (in kubectl, it can be done by
using the `--force-conflicts` flag with the apply command) 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.