Merge branch 'master' into feature/US-598183-1

PEGA-NarasimhaRao-Meda · Feb 22, 2024 · 9f0e284 · 9f0e284
2 parents 2b11cc6 + 8c960b9
commit 9f0e284
Show file tree

Hide file tree

Showing 6 changed files with 113 additions and 11 deletions.
diff --git a/charts/pega/README.md b/charts/pega/README.md
@@ -1307,3 +1307,12 @@ tls:
       insecureSkipVerify: true
 
 ```
+
+```yaml
+# To enable HorizontalPodAutoscaler behavior specifications, configure the following settings against each tier:
+behavior:
+   scaleDown:
+      stabilizationWindowSeconds: << provide scaleDown stabilization window in seconds >>
+   scaleUp:
+      stabilizationWindowSeconds: << provide scaleUp stabilization window in seconds >>
+```
diff --git a/charts/pega/templates/_pega_hpa.tpl b/charts/pega/templates/_pega_hpa.tpl
@@ -28,7 +28,7 @@ spec:
   maxReplicas: {{ .hpa.maxReplicas }}
   {{- else }}
   maxReplicas: 5
-  {{- end }} 
+  {{- end }}
   metrics:
   {{- if (hasKey .hpa "enableCpuTarget" | ternary .hpa.enableCpuTarget true) }}
   - type: Resource
@@ -58,6 +58,10 @@ spec:
         averageUtilization: 85
         {{- end }}
   {{- end }}
+  {{- if .hpa.behavior}}
+  behavior:
+{{ toYaml .hpa.behavior | indent 4 }}
+  {{- end }}
 
 ---
 {{- end -}}

diff --git a/charts/pega/values-large.yaml b/charts/pega/values-large.yaml
@@ -216,6 +216,11 @@ global:
 
       hpa:
         enabled: true
+        # To configure behavior specifications for hpa, set the required scaleUp & scaleDown values.
+        # See, https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/#stabilization-window
+        # behavior:
+        #  scaleDown:
+        #    stabilizationWindowSeconds: 600
 
       # key/value pairs that are attached to the pods (https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)
       # podLabels:

diff --git a/charts/pega/values.yaml b/charts/pega/values.yaml
@@ -247,6 +247,11 @@ global:
 
       hpa:
         enabled: true
+        # To configure behavior specifications for hpa, set the required scaleUp & scaleDown values.
+        # See, https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/#stabilization-window
+        # behavior:
+        #  scaleDown:
+        #    stabilizationWindowSeconds: 600
 
       # key/value pairs that are attached to the pods (https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)
       # podLabels:

diff --git a/terratest/src/test/pega/data/values_hpa_behavior.yaml b/terratest/src/test/pega/data/values_hpa_behavior.yaml
@@ -0,0 +1,17 @@
+---
+global:
+  tier:
+    - name: "web"
+      hpa:
+        enabled: true
+        behavior:
+          scaleDown:
+            stabilizationWindowSeconds: 300
+          scaleUp:
+            stabilizationWindowSeconds: 0
+    - name: "batch"
+      hpa:
+        enabled: true
+        behavior:
+          scaleDown:
+            stabilizationWindowSeconds: 200
diff --git a/terratest/src/test/pega/pega-tier-hpa_test.go b/terratest/src/test/pega/pega-tier-hpa_test.go
@@ -222,6 +222,61 @@ func TestPegaTierOverrideValues(t *testing.T) {
 	}
 }
 
+func TestPegaTierHPAWithBehavior(t *testing.T) {
+	var supportedVendors = []string{"k8s", "openshift", "eks", "gke", "aks", "pks"}
+	var supportedOperations = []string{"deploy", "install-deploy", "upgrade-deploy"}
+	var deploymentNames = []string{"pega", "myapp-dev"}
+
+	helmChartPath, err := filepath.Abs(PegaHelmChartPath)
+	require.NoError(t, err)
+
+	testsPath, err := filepath.Abs(PegaHelmChartTestsPath)
+	require.NoError(t, err)
+
+	for _, vendor := range supportedVendors {
+
+		for _, operation := range supportedOperations {
+
+			for _, depName := range deploymentNames {
+				fmt.Println(vendor + "-" + operation + "-" + depName)
+
+				var options = &helm.Options{
+					SetValues: map[string]string{
+						"global.provider":               vendor,
+						"global.actions.execute":        operation,
+						"installer.upgrade.upgradeType": "zero-downtime",
+					},
+				}
+
+				yamlContent := RenderTemplate(t, options, helmChartPath, []string{"templates/pega-tier-hpa.yaml"}, "--values", testsPath+"/data/values_hpa_behavior.yaml")
+				verifyPegaHPAs(t, yamlContent, options, []hpa{
+					{
+						name:                         getObjName(options, "-web-hpa"),
+						targetRefName:                getObjName(options, "-web"),
+						kind:                         "Deployment",
+						apiversion:                   "apps/v1",
+						cpu:                          true,
+						cpuValue:                     parseResourceValue(t, "2.55"),
+						behavior:                     true,
+						scaleDownStabilizationWindow: 300,
+						scaleUpStabilizationWindow:   0,
+					},
+					{
+						name:                         getObjName(options, "-batch-hpa"),
+						targetRefName:                getObjName(options, "-batch"),
+						kind:                         "Deployment",
+						apiversion:                   "apps/v1",
+						cpu:                          true,
+						cpuValue:                     parseResourceValue(t, "2.55"),
+						behavior:                     true,
+						scaleDownStabilizationWindow: 200,
+					},
+				})
+			}
+		}
+	}
+}
+
 // verifyPegaHPAs - Splits the HPA object from the rendered template and asserts each HPA object
 func verifyPegaHPAs(t *testing.T, yamlContent string, options *helm.Options, expectedHpas []hpa) {
 	var pegaHpaObj autoscaling.HorizontalPodAutoscaler
@@ -270,20 +325,27 @@ func verifyPegaHpa(t *testing.T, hpaObj *autoscaling.HorizontalPodAutoscaler, ex
 		require.Equal(t, expectedValue, actual)
 	}
 
+	if expectedHpa.behavior {
+		require.Equal(t, *hpaObj.Spec.Behavior.ScaleDown.StabilizationWindowSeconds, expectedHpa.scaleDownStabilizationWindow)
+		require.Equal(t, *hpaObj.Spec.Behavior.ScaleUp.StabilizationWindowSeconds, expectedHpa.scaleUpStabilizationWindow)
+	}
 	require.Equal(t, int32(5), hpaObj.Spec.MaxReplicas)
 }
 
 type hpa struct {
-	name          string
-	targetRefName string
-	kind          string
-	apiversion    string
-	labels        map[string]string
-	cpu           bool
-	cpuValue      resource.Quantity
-	cpuPercent    int32
-	mem           bool
-	memPercent    int32
+	name                         string
+	targetRefName                string
+	kind                         string
+	apiversion                   string
+	labels                       map[string]string
+	cpu                          bool
+	cpuValue                     resource.Quantity
+	cpuPercent                   int32
+	mem                          bool
+	memPercent                   int32
+	behavior                     bool
+	scaleDownStabilizationWindow int32
+	scaleUpStabilizationWindow   int32
 }
 
 func (h hpa) expectedMetricCount() int {