Corrected documentation removed environment variable support and chan…

…ged the settings key

Signed-off-by: anandf <anjoseph@redhat.com>

docs/operator-manual/app-sync-using-impersonation.md

@@ -36,10 +36,10 @@ kubectl --as <user-to-impersonate> --as-group <group-to-impersonate> ...
 
 In order for an application to use a different service account for the application sync operation, the following steps needs to be performed:
 
-1. The impersonation feature flag should be enabled by setting the value of key `application.impersonation.enabled` to `true` in the `argocd-cmd-params-cm` ConfigMap as below:
+1. The impersonation feature flag should be enabled by setting the value of key `application.sync.impersonation.enabled` to `true` in the `argocd-cm` ConfigMap as below:
 ```yaml
 data:
-  application.impersonation.enabled: true
+  application.sync.impersonation.enabled: true
 ```
 
 2. The `AppProject` referenced by the `.spec.project` field of the `Application` must have the `DestinationServiceAccounts` mapping the destination server and namespace to a service account to be used for the sync operation.
@@ -49,11 +49,11 @@ data:
 
 ### Enable application sync with impersonation feature
 
-In order to enable this feature, the Argo CD administrator must reconfigure the `application.impersonation.enabled` settings in the `argocd-cmd-params-cm` ConfigMap as below:
+In order to enable this feature, the Argo CD administrator must reconfigure the `application.sync.impersonation.enabled` settings in the `argocd-cm` ConfigMap as below:
 
 ```yaml
 data:
-  application.impersonation.enabled: true
+  application.sync.impersonation.enabled: true
 ```
 
 ## Configuring destination service accounts

docs/operator-manual/argocd-cm.yaml

@@ -406,3 +406,6 @@ data:
               cluster:
                 name: some-cluster
                 server: https://some-cluster
+
+  # application.sync.impersonation.enabled indicates whether the application sync can be decoupled from control plane service account using impersonation.
+  application.sync.impersonation.enabled: "false"

docs/proposals/decouple-application-sync-user-using-impersonation.md

@@ -157,10 +157,7 @@ So that, I can use a generic convention of naming service accounts and avoid ass
 
 #### Component: ArgoCD Application Controller
 
-- Provide a configuration in `argocd-cm`  which can be modified to enable the Impersonation feature. Set `application.enable.impersonation: true` in the Argo CD ConfigMap. Default value of `application.enable.impersonation` would be `false` and user has to explicitly override it to use this feature.
-- Provide an option to override the Impersonation feature using environment variables.
-Set `ARGOCD_APPLICATION_CONTROLLER_ENABLE_IMPERSONATION=true` in the Application controller environment variables. Default value of the environment variable must be `false` and user has to explicitly set it to `true` to use this feature.
-- Provide an option to enable this feature using a command line flag `--enable-impersonation`. This new argument option needs to be added to the Application controller args.
+- Provide a configuration in `argocd-cm`  which can be modified to enable the Impersonation feature. Set `application.sync.impersonation.enabled: true` in the Argo CD ConfigMap. Default value of `application.sync.impersonation.enabled` would be `false` and user has to explicitly override it to use this feature.
 - Fix Application Controller `sync.go` to set the Impersonate configuration from the AppProject CR to the `SyncContext` Object (rawConfig and restConfig field, need to understand which config is used for the actual sync and if both configs need to be impersonated.)
 
 #### Component: ArgoCD UI
@@ -195,7 +192,7 @@ kubectl apply -f https://raw.githubusercontent.com/argoproj/argo-cd/master/manif
 
 - Enable the impersonation feature in ArgoCD.
 ```shell
-kubectl set env statefulset/argocd-application-controller ARGOCD_APPLICATION_CONTROLLER_ENABLE_IMPERSONATION=true
+kubectl patch cm argocd-cm -n argocd --type json --patch '[{ "op": "add", "path": "/data/application.sync.impersonation.enabled", "value": "true" }]'
 ```
 
 - Create a namespace called `guestbook` and a service account called `guestbook-deployer`.
@@ -259,7 +256,7 @@ kubectl apply -f https://raw.githubusercontent.com/argoproj/argo-cd/master/manif
 
 - Enable the impersonation feature in ArgoCD.
 ```shell
-kubectl set env statefulset/argocd-application-controller ARGOCD_APPLICATION_CONTROLLER_ENABLE_IMPERSONATION=true
+kubectl patch cm argocd-cm -n argocd --type json --patch '[{ "op": "add", "path": "/data/application.sync.impersonation.enabled", "value": "true" }]'
 ```
 
 - Create a namespace called `guestbook` and a service account called `guestbook-deployer`.
@@ -327,7 +324,7 @@ kubectl apply -f https://raw.githubusercontent.com/argoproj/argo-cd/master/manif
 
 - Enable the impersonation feature in ArgoCD.
 ```shell
-kubectl set env statefulset/argocd-application-controller ARGOCD_APPLICATION_CONTROLLER_ENABLE_IMPERSONATION=true
+kubectl patch cm argocd-cm -n argocd --type json --patch '[{ "op": "add", "path": "/data/application.sync.impersonation.enabled", "value": "true" }]'
 ```
 
 - Add the remote cluster as a destination to argocd
@@ -400,7 +397,7 @@ kubectl apply -f https://raw.githubusercontent.com/argoproj/argo-cd/master/manif
 
 - Enable the impersonation feature in ArgoCD.
 ```shell
-kubectl set env statefulset/argocd-application-controller ARGOCD_APPLICATION_CONTROLLER_ENABLE_IMPERSONATION=true
+kubectl patch cm argocd-cm -n argocd --type json --patch '[{ "op": "add", "path": "/data/application.sync.impersonation.enabled", "value": "true" }]'
 ```
 
 - In the remote cluster, create a service account called `argocd-admin`

util/settings/settings.go

@@ -508,7 +508,7 @@ const (
 	RespectRBACValueStrict = "strict"
 	RespectRBACValueNormal = "normal"
 	// impersonationEnabledKey is the key to configure whether the application sync decoupling through impersonation feature is enabled
-	impersonationEnabledKey = "application.impersonation.enabled"
+	impersonationEnabledKey = "application.sync.impersonation.enabled"
 )
 
 var (