Merge branch 'master' into US-624029

terratest/src/test/pega/pega-tier-deployment_test.go

@@ -94,7 +94,7 @@ func TestPegaTierDeploymentWithHazelcastSSL(t *testing.T) {
 	}
 }
 
-func assertStreamWithSorageClass(t *testing.T, streamYaml string, options *helm.Options) {
+/*func assertStreamWithSorageClass(t *testing.T, streamYaml string, options *helm.Options) {
 	var statefulsetObj appsv1beta2.StatefulSet
 	UnmarshalK8SYaml(t, streamYaml, &statefulsetObj)
 	require.Equal(t, statefulsetObj.ObjectMeta.Name, getObjName(options, "-stream"))
@@ -145,6 +145,36 @@ func TestPegaTierDeploymentWithPodAffinity(t *testing.T) {
 	}
 }
 
+func TestPegaTierDeploymentWithTCPProbe(t *testing.T) {
+
+	var supportedVendors = []string{"k8s", "eks", "gke", "aks", "pks"}
+	helmChartPath, err := filepath.Abs(PegaHelmChartPath)
+	require.NoError(t, err)
+
+	var depObj appsv1.Deployment
+
+	for _, vendor := range supportedVendors {
+		var options = &helm.Options{
+			SetValues: map[string]string{
+				"global.provider":                  vendor,
+				"global.actions.execute":           "deploy",
+				"global.deployment.name":           "pega",
+				"global.tier[0].name":              "web",
+				"global.tier[0].tcpKeepAliveProbe": "10",
+			},
+		}
+
+		yamlContent := RenderTemplate(t, options, helmChartPath, []string{"templates/pega-tier-deployment.yaml"})
+		yamlSplit := strings.Split(yamlContent, "---")
+
+		UnmarshalK8SYaml(t, yamlSplit[1], &depObj)
+		require.Equal(t, "net.ipv4.tcp_keepalive_time", *&depObj.Spec.Template.Spec.SecurityContext.Sysctls[0].Name)
+		require.Equal(t, "10", *&depObj.Spec.Template.Spec.SecurityContext.Sysctls[0].Value)
+
+	}
+
+}
+
 func TestPegaTierDeploymentWithFSGroup(t *testing.T) {
 	var supportedVendors = []string{"k8s", "eks", "gke", "aks", "pks"}
 	customFsGroups := map[string]int64{
@@ -183,13 +213,12 @@ func TestPegaTierDeploymentWithFSGroup(t *testing.T) {
 	}
 }
 
-func assertStreamWithHZSSL(t *testing.T, streamYaml string, options *helm.Options, hazelcastSSL bool) {
+/*func assertStream(t *testing.T, streamYaml string, options *helm.Options) {
 	var statefulsetObj appsv1beta2.StatefulSet
 	UnmarshalK8SYaml(t, streamYaml, &statefulsetObj)
 	require.Equal(t, statefulsetObj.ObjectMeta.Name, getObjName(options, "-stream"))
-	VerifyPegaStatefulSet(t, &statefulsetObj, pegaDeployment{getObjName(options, "-stream"),
-		initContainers, "Stream", "900"}, options, hazelcastSSL)
-}
+	VerifyPegaStatefulSet(t, &statefulsetObj, pegaDeployment{getObjName(options, "-stream"), initContainers, "Stream", "900"}, options)
+}*/
 
 func assertStream(t *testing.T, streamYaml string, options *helm.Options) {
 	assertStreamWithHZSSL(t, streamYaml, options, false)