@@ -234,15 +234,15 @@ labels:
234234` ` `
235235
236236After the first reconciliation, the Machine gets above labels.
237- Now assume that we remove label ` a ` from the MachineDeployment; The expected set of labels is
237+ Now assume that we remove label ` b ` from the MachineDeployment; The expected set of labels is
238238
239239` ` ` yaml
240240labels:
241241 a: a
242242` ` `
243243
244- But the machine still has the label `b`, but we cannot remove it, because at this stage we do not know
245- if this label has been applied by Cluster API or by the user or another controllers.
244+ But the machine still has the label `b`, and the controller cannot remove it, because at this stage there is not
245+ a clear signal allowing to detect if this label has been applied by Cluster API or by the user or another controllers.
246246
247247In order to manage properly this use case, that is co-authored maps, the solution available in API server is
248248to use [Server Side Apply patches](https://kubernetes.io/docs/reference/using-api/server-side-apply/).
@@ -260,7 +260,7 @@ build in capabilities is a stronger, long term solution than any other alternati
260260
261261# ## To not use SSA for [in-place propagation](#in-place-propagation) and be authoritative on labels and annotations
262262
263- If Cluster API uses regular patches instead of SSA patches, a a well tested path in Cluster API, Cluster API can
263+ If Cluster API uses regular patches instead of SSA patches, a well tested path in Cluster API, Cluster API can
264264be implemented in order to be authoritative on label and annotations, that means that all the labels and annotations should
265265be propagated from higher level objects (e.g. all the Machine's labels should be set on the MachineSet, and going
266266on up the propagation chain).
0 commit comments