From da51842bbb94f186d50bfedd2bfd4298ca9fb8d5 Mon Sep 17 00:00:00 2001 From: Antoine Pelisse Date: Wed, 11 Sep 2019 03:35:25 -0700 Subject: [PATCH] Fix list in SSA docs (#16272) * Fix list * Translate french word to english --- content/en/docs/reference/using-api/api-concepts.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/content/en/docs/reference/using-api/api-concepts.md b/content/en/docs/reference/using-api/api-concepts.md index 003bc81157..c989fd1a1f 100644 --- a/content/en/docs/reference/using-api/api-concepts.md +++ b/content/en/docs/reference/using-api/api-concepts.md @@ -543,10 +543,11 @@ used when merging objects of this type. As a developer of a controller, you can use server-side apply as a way to simplify the update logic of your controller. The main differences with a read-modify-write and/or patch are the following: -- the applied object must contain all the fields that the controller cares about. -- there are no way to remove fields that haven't been applied by the controller + +* the applied object must contain all the fields that the controller cares about. +* there are no way to remove fields that haven't been applied by the controller before (controller can still send a PATCH/UPDATE for these use-cases). -- the objet doesn't have to be read beforehand, `resourceVersion` doesn't have +* the object doesn't have to be read beforehand, `resourceVersion` doesn't have to be specified. It is strongly recommended for controllers to always "force" conflicts, since they