From 1509e1d3b2cdfde4ace39db8c5dfe9016c9f2936 Mon Sep 17 00:00:00 2001
From: Juanita-Balaraj <juanita.balaraj@windriver.com>
Date: Fri, 16 Dec 2022 19:44:53 -0500
Subject: [PATCH] Added --reuse-attributes

Fixed merge conflicts
Fixed Patchset 6 comments
Deleted additional entries of attributes
Resaved the updates
Updated comments from Patchset 2
Modified text

Signed-off-by: Juanita-Balaraj <juanita.balaraj@windriver.com>
Change-Id: I1039d1b53fbf00ec499339b1b8fdc1d6bcf28890
---
 ...in-application-commands-and-helm-overrides.rst | 12 +++++++++++-
 .../kubernetes-admin-tutorials-metrics-server.rst |  3 ++-
 .../application-commands-and-helm-overrides.rst   | 15 ++++++++++++++-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/doc/source/admintasks/kubernetes/admin-application-commands-and-helm-overrides.rst b/doc/source/admintasks/kubernetes/admin-application-commands-and-helm-overrides.rst
index c97c8fd09..c19f31770 100644
--- a/doc/source/admintasks/kubernetes/admin-application-commands-and-helm-overrides.rst
+++ b/doc/source/admintasks/kubernetes/admin-application-commands-and-helm-overrides.rst
@@ -387,7 +387,7 @@ commands to manage containerized applications provided as part of |prod|.
 
     .. code-block:: none
 
-        ~(keystone_admin)]$ system application-update [-n | --app-name] <app_name> [-v | --app-version] <version> <tar_file>
+        ~(keystone_admin)]$ system application-update [-n | --app-name] <app_name> [-v | --app-version] <version> [ --reuse-attributes <true/false> ] [ --reuse-user-overrides ` <true/false> ] <tar_file>
 
     where the following are optional arguments:
 
@@ -416,6 +416,16 @@ commands to manage containerized applications provided as part of |prod|.
     **<version>**
         The version to update the application to.
 
+    **reuse-attributes**
+        If the user disabled some Helm charts (using :command:`system helm-chart-attribute-modify --enabled false`)
+        and wants to keep them disabled during an app-update then the user
+        should use ``--reuse-attributes true``.
+
+    **reuse-user-overrides**
+        If the user added some Helm chart overrides
+        (using :command:`system helm-override-update`) and wants to keep them
+        over an app-update then the user should use ``--reuse-user-overrides true``.
+
     and the following is a positional argument which must come last:
 
     **<tar_file>**
diff --git a/doc/source/admintasks/kubernetes/kubernetes-admin-tutorials-metrics-server.rst b/doc/source/admintasks/kubernetes/kubernetes-admin-tutorials-metrics-server.rst
index 28c1ed801..e423ffd3e 100644
--- a/doc/source/admintasks/kubernetes/kubernetes-admin-tutorials-metrics-server.rst
+++ b/doc/source/admintasks/kubernetes/kubernetes-admin-tutorials-metrics-server.rst
@@ -79,7 +79,7 @@ of Metrics API.
 
     .. code-block:: none
 
-        ~(keystone_admin)]$ system application-update --reuse-user-overrides true /usr/local/share/applications/helm/metrics-server-1.0-18.tgz
+        ~(keystone_admin)]$ system application-update /usr/local/share/applications/helm/metrics-server-1.0-18.tgz
 
 
 For details on leveraging Metrics Server for horizontal autoscaling or for
@@ -93,3 +93,4 @@ For more information see:
 `https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#top
 <https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#top>`__
 
+
diff --git a/doc/source/system_configuration/kubernetes/application-commands-and-helm-overrides.rst b/doc/source/system_configuration/kubernetes/application-commands-and-helm-overrides.rst
index 97f29d87e..5b8f09f83 100644
--- a/doc/source/system_configuration/kubernetes/application-commands-and-helm-overrides.rst
+++ b/doc/source/system_configuration/kubernetes/application-commands-and-helm-overrides.rst
@@ -97,6 +97,7 @@ commands to manage containerized applications provided as part of |prod|.
     **<tar_file>**
         is the path to the tar file containing the application to be uploaded.
 
+
     For example:
 
     .. parsed-literal::
@@ -395,7 +396,7 @@ commands to manage containerized applications provided as part of |prod|.
 
     .. code-block:: none
 
-        ~(keystone_admin)]$ system application-update [-n | --app-name] <app_name> [-v | --app-version] <version> <tar_file>
+        ~(keystone_admin)]$ system application-update [-n | --app-name] <app_name> [-v | --app-version] <version> [ --reuse-attributes <true/false> ] [ --reuse-user-overrides ` <true/false> ] <tar_file>
 
     where the following are optional arguments:
 
@@ -422,6 +423,16 @@ commands to manage containerized applications provided as part of |prod|.
     **<version>**
         The version to update the application to.
 
+    **reuse-attributes**
+        If the user disabled some Helm charts (using :command:`system helm-chart-attribute-modify --enabled false`)
+        and wants to keep them disabled during an app-update then the user
+        should use ``--reuse-attributes true``.
+
+    **reuse-user-overrides**
+        If the user added some Helm chart overrides
+        (using :command:`system helm-override-update`) and wants to keep them
+        over an app-update then the user should use ``--reuse-user-overrides true``.
+
     and the following is a positional argument which must come last:
 
     **<tar_file>**
@@ -485,3 +496,5 @@ commands to manage containerized applications provided as part of |prod|.
 
         ~(keystone_admin)]$ system application-delete metrics-server
         Application metrics-server deleted.
+
+