Allow injection of arbitrary properties into setupDatabase.properties…

… via ADVANCED_SETTINGS (#351)
pegasystems · Oct 18, 2021 · c36c4fe · c36c4fe
1 parent 1909c80
commit c36c4fe
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 13 deletions.
diff --git a/charts/pega/charts/installer/config/setupDatabase.properties.tmpl b/charts/pega/charts/installer/config/setupDatabase.properties.tmpl
@@ -83,5 +83,7 @@ bypass.load.engine.classes={{ .Env.BYPASS_LOAD_ENGINE_CLASSES }}
 bypass.load.assembled.classes={{ .Env.BYPASS_LOAD_ASSEMBLED_CLASSES }}
 {{- end }}
 
-#Enable adminstrator user after upgrade by default.
-upgrade.enable.admin=true
+# Enable adminstrator user after upgrade by default.
+upgrade.enable.admin=true
+
+{{ .Env.ADVANCED_SETTINGS }}
diff --git a/charts/pega/charts/installer/templates/pega-install-environment-config.yaml b/charts/pega/charts/installer/templates/pega-install-environment-config.yaml
@@ -70,4 +70,10 @@ data:
   # Bypass loading assembly classes into database during installation
   BYPASS_LOAD_ASSEMBLED_CLASSES: {{ .Values.bypassLoadAssembledClasses | quote }}
 {{- end }}
+{{- if .Values.advancedSettings }}
+  ADVANCED_SETTINGS: |-
+{{- range .Values.advancedSettings }}
+    {{ .name }}={{ .value }}
+{{- end }}
+{{ end }}
 {{ end }}
diff --git a/charts/pega/charts/installer/templates/pega-upgrade-environment-config.yaml b/charts/pega/charts/installer/templates/pega-upgrade-environment-config.yaml
@@ -80,4 +80,10 @@ data:
   # Bypass loading assembly classes into database during installation
   BYPASS_LOAD_ASSEMBLED_CLASSES: {{ .Values.bypassLoadAssembledClasses | quote }}
 {{- end }}
+{{- if .Values.advancedSettings }}
+  ADVANCED_SETTINGS: |-
+{{- range .Values.advancedSettings }}
+    {{ .name }}={{ .value }}
+{{- end }}
+{{ end }}
 {{ end }}
diff --git a/terratest/src/test/pega/data/expectedSetupdatabase.properties b/terratest/src/test/pega/data/expectedSetupdatabase.properties
@@ -83,5 +83,7 @@ bypass.load.engine.classes={{ .Env.BYPASS_LOAD_ENGINE_CLASSES }}
 bypass.load.assembled.classes={{ .Env.BYPASS_LOAD_ASSEMBLED_CLASSES }}
 {{- end }}
 
-#Enable adminstrator user after upgrade by default.
-upgrade.enable.admin=true
+# Enable adminstrator user after upgrade by default.
+upgrade.enable.admin=true
+
+{{ .Env.ADVANCED_SETTINGS }}
diff --git a/terratest/src/test/pega/utilities.go b/terratest/src/test/pega/utilities.go
@@ -14,7 +14,6 @@ import (
 var volumeDefaultMode int32 = 420
 var volumeDefaultModePtr = &volumeDefaultMode
 
-
 // compareConfigMapData - Compares the config map deployed for each kind of tier with the excepted xml's
 func compareConfigMapData(t *testing.T, actualFileData string, expectedFileName string) {
 	expectedFile, err := ioutil.ReadFile(expectedFileName)
@@ -25,6 +24,9 @@ func compareConfigMapData(t *testing.T, actualFileData string, expectedFileName
 	equal := false
 	if expectedFileData == actualFileData {
 		equal = true
+	} else {
+		println("Expected yaml contents:\n" + expectedFileData)
+		println("Actual yaml contents:\n" + actualFileData)
 	}
 	require.Equal(t, true, equal)
 }
@@ -43,7 +45,7 @@ func aksSpecificUpgraderDeployEnvs(t *testing.T, options *helm.Options, containe
 
 // VerifyInitContinerData - Verifies any possible initContainer that can occur in pega helm chart deployments
 func VerifyInitContinerData(t *testing.T, containers []k8score.Container, options *helm.Options) {
-    var depName = getDeploymentName(options)
+	var depName = getDeploymentName(options)
 
 	if len(containers) == 0 {
 		println("no init containers")
@@ -83,15 +85,14 @@ func VerifyInitContinerData(t *testing.T, containers []k8score.Container, option
 	}
 }
 
-
 func getDeploymentName(options *helm.Options) string {
-    var depName string = options.SetValues["global.deployment.name"]
-    if (depName == "") {
-        depName = "pega"
-    }
-    return depName
+	var depName string = options.SetValues["global.deployment.name"]
+	if depName == "" {
+		depName = "pega"
+	}
+	return depName
 }
 
 func getObjName(options *helm.Options, suffix string) string {
-    return getDeploymentName(options) + suffix
+	return getDeploymentName(options) + suffix
 }