US-533044 - Helm chart changes for hz settings to be passed to instal…

…ler (#589) * US-533044 - Helm chart changes for hz setting to be passed to installer
pegasystems · Jul 3, 2023 · 1118d2b · 1118d2b
1 parent ec0b57e
commit 1118d2b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/charts/pega/charts/installer/config/setupDatabase.properties.tmpl b/charts/pega/charts/installer/config/setupDatabase.properties.tmpl
@@ -86,4 +86,6 @@ bypass.load.assembled.classes={{ .Env.BYPASS_LOAD_ASSEMBLED_CLASSES }}
 # Enable adminstrator user after upgrade by default.
 upgrade.enable.admin=true
 
+custom.jvm.args={{ .Env.CUSTOM_JVM_ARGS }}
+
 {{ .Env.ADVANCED_SETTINGS }}
diff --git a/charts/pega/charts/installer/templates/_pega-installer-job.tpl b/charts/pega/charts/installer/templates/_pega-installer-job.tpl
@@ -117,6 +117,23 @@ spec:
         env:
         -  name: ACTION
            value: {{ .action }}
+{{- if (eq .root.Values.upgrade.isHazelcastClientServer "true") }}
+        -  name: HZ_VERSION
+           valueFrom:
+            configMapKeyRef:
+              name: {{ template "pegaEnvironmentConfig" }}
+              key: HZ_VERSION
+        -  name: HZ_CLUSTER_NAME
+           valueFrom:
+            configMapKeyRef:
+              name: {{ template "pegaEnvironmentConfig" }}
+              key: HZ_CLUSTER_NAME
+        -  name: HZ_SERVER_HOSTNAME
+           valueFrom:
+            configMapKeyRef:
+              name: {{ template "pegaEnvironmentConfig" }}
+              key: HZ_SERVER_HOSTNAME
+{{- end }}
         envFrom:
         - configMapRef:
             name: {{ template "pegaUpgradeEnvironmentConfig" }}

diff --git a/charts/pega/charts/installer/values.yaml b/charts/pega/charts/installer/values.yaml
@@ -69,6 +69,9 @@ upgrade:
   runRulesetCleanup: "false"
   # Rebuild Database Rules Indexes after Rules Load to improve Database Access Performance
   rebuildIndexes: "false"
+  # This flag has to be set for CMC use cases if hazelcast is running in client server mode. Default is false.Set it to true for HZ c/s mode.
+  # This is needed to ensure Installer connect to HZ C/S while data upgrade.
+  isHazelcastClientServer: "false"
   # Specify the server URL and the required server username and password to access a Pega REST server used to perform pre- and post-update actions during zero-downtime updates.
   pegaRESTServerURL: ""
   pegaRESTUsername: ""

diff --git a/terratest/src/test/pega/data/expectedSetupdatabase.properties b/terratest/src/test/pega/data/expectedSetupdatabase.properties
@@ -86,4 +86,6 @@ bypass.load.assembled.classes={{ .Env.BYPASS_LOAD_ASSEMBLED_CLASSES }}
 # Enable adminstrator user after upgrade by default.
 upgrade.enable.admin=true
 
+custom.jvm.args={{ .Env.CUSTOM_JVM_ARGS }}
+
 {{ .Env.ADVANCED_SETTINGS }}