From 241591fcdaf19b8147973a61b67a21cab50cda3a Mon Sep 17 00:00:00 2001 From: Wladimir Sidorenko Date: Fri, 20 Feb 2026 22:13:56 +0100 Subject: [PATCH] Update addon configuration conflict resolution notes Clarified conflict resolution instructions for addon configuration. --- docs/clusters/addons.adoc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/clusters/addons.adoc b/docs/clusters/addons.adoc index 082906c..7996ffc 100644 --- a/docs/clusters/addons.adoc +++ b/docs/clusters/addons.adoc @@ -204,11 +204,10 @@ addons: [NOTE] ==== Bear in mind that when addon configuration values are being modified, configuration conflicts will arise. +Thus, we need to specify how to deal with those by setting the `resolveConflicts` field accordingly. +As in this scenario we want to modify these values, we'd set `resolveConflicts: overwrite`. ==== - Thus, we need to specify how to deal with those by setting the `resolveConflicts` field accordingly. - As in this scenario we want to modify these values, we'd set `resolveConflicts: overwrite`. - Additionally, the get command will now also retrieve `ConfigurationValues` for the addon. e.g. [,console]