From 697b6050c0d5b4fb63fe9209b6b0f5a96e6407f8 Mon Sep 17 00:00:00 2001
From: Heshma <heshmareddy@gmail.com>
Date: Tue, 12 Mar 2024 14:07:41 -0400
Subject: [PATCH] Changing the setting to remove trailing /default so that it
 is not overrided when a different value is through DASS (#718)

* Adding custom artifactory creds in installer subchart

* Adding custom artifactory creds in installer subchart

* Adding custom artifactory creds in installer subchart

* added test

* Always setting initialization/persistrequestor to the value OnTimeout to cleanup requestors and avoid memory issues

* Always setting initialization/persistrequestor to the value OnTimeout to cleanup requestors and avoid memory issues

* Changing the setting to remove trailing /default so that it is not overrided when a different value is through DASS

---------

Co-authored-by: degah <HeshmaReddy.Dega@in.pega.com>
---
 charts/pega/config/deploy/context.xml.tmpl                      | 2 +-
 .../src/test/pega/data/expectedInstallDeployContext.xml.tmpl    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/pega/config/deploy/context.xml.tmpl b/charts/pega/config/deploy/context.xml.tmpl
index a99756d36..1ef3717b3 100644
--- a/charts/pega/config/deploy/context.xml.tmpl
+++ b/charts/pega/config/deploy/context.xml.tmpl
@@ -74,7 +74,7 @@
   {{ else }}
   <Environment name="prconfig/database/databases/CustomerData/defaultSchema" value="{{ .Env.DATA_SCHEMA }}" type="java.lang.String" />
   {{ end }}
-  <Environment name="prconfig/initialization/persistrequestor/default" value="OnTimeout" type="java.lang.String" />
+  <Environment name="prconfig/initialization/persistrequestor" value="OnTimeout" type="java.lang.String" />
   {{ if .Env.REQUESTOR_PASSIVATION_TIMEOUT }}
   <Environment name="prconfig/timeout/browser" value="{{ .Env.REQUESTOR_PASSIVATION_TIMEOUT }}" type="java.lang.String" />
   {{ end }}
diff --git a/terratest/src/test/pega/data/expectedInstallDeployContext.xml.tmpl b/terratest/src/test/pega/data/expectedInstallDeployContext.xml.tmpl
index a99756d36..1ef3717b3 100644
--- a/terratest/src/test/pega/data/expectedInstallDeployContext.xml.tmpl
+++ b/terratest/src/test/pega/data/expectedInstallDeployContext.xml.tmpl
@@ -74,7 +74,7 @@
   {{ else }}
   <Environment name="prconfig/database/databases/CustomerData/defaultSchema" value="{{ .Env.DATA_SCHEMA }}" type="java.lang.String" />
   {{ end }}
-  <Environment name="prconfig/initialization/persistrequestor/default" value="OnTimeout" type="java.lang.String" />
+  <Environment name="prconfig/initialization/persistrequestor" value="OnTimeout" type="java.lang.String" />
   {{ if .Env.REQUESTOR_PASSIVATION_TIMEOUT }}
   <Environment name="prconfig/timeout/browser" value="{{ .Env.REQUESTOR_PASSIVATION_TIMEOUT }}" type="java.lang.String" />
   {{ end }}