-
Notifications
You must be signed in to change notification settings - Fork 204
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feature/clustering-service-name
- Loading branch information
Showing
9 changed files
with
125 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
terratest/src/test/pega/data/values_custom_lifecycle_hooks.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| --- | ||
| global: | ||
| tier: | ||
| - name: "web" | ||
| nodeType: "WebUser" | ||
| requestor: | ||
| passivationTimeSec: 900 | ||
| replicas: 1 | ||
| deploymentStrategy: | ||
| rollingUpdate: | ||
| maxSurge: 1 | ||
| maxUnavailable: 0 | ||
| type: RollingUpdate | ||
| livenessProbe: | ||
| port: 8081 | ||
| # Values for test - web | ||
| custom: | ||
| containerLifecycleHooks: | ||
| preStop: | ||
| exec: | ||
| command: | ||
| - sleep | ||
| - '15' |
49 changes: 49 additions & 0 deletions
49
terratest/src/test/pega/pega-tier-deployment-with-lifecycle-hooks_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| package pega | ||
|
|
||
| import ( | ||
| "github.com/gruntwork-io/terratest/modules/helm" | ||
| "github.com/stretchr/testify/require" | ||
| appsv1 "k8s.io/api/apps/v1" | ||
| "path/filepath" | ||
| "strings" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestPegaDeploymentWithLifecycleHooks(t *testing.T) { | ||
| var supportedVendors = []string{"k8s"} | ||
| var supportedOperations = []string{"deploy", "install-deploy", "upgrade-deploy"} | ||
| var deploymentNames = []string{"pega", "myapp-dev"} | ||
|
|
||
| helmChartPath, err := filepath.Abs(PegaHelmChartPath) | ||
| require.NoError(t, err) | ||
|
|
||
| for _, vendor := range supportedVendors { | ||
| for _, operation := range supportedOperations { | ||
| for _, depName := range deploymentNames { | ||
| var options = &helm.Options{ | ||
| ValuesFiles: []string{"data/values_custom_lifecycle_hooks.yaml"}, | ||
| SetValues: map[string]string{ | ||
| "global.deployment.name": depName, | ||
| "global.provider": vendor, | ||
| "global.actions.execute": operation, | ||
| "installer.upgrade.upgradeType": "zero-downtime", | ||
| }, | ||
| } | ||
| deploymentYaml := RenderTemplate(t, options, helmChartPath, []string{"templates/pega-tier-deployment.yaml"}) | ||
| yamlSplit := strings.Split(deploymentYaml, "---") | ||
| assertWeb(t, yamlSplit[1], options) | ||
| assertLifecycleHook(t, yamlSplit[1], options) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func assertLifecycleHook(t *testing.T, tierYaml string, options *helm.Options) { | ||
| var deploymentObj appsv1.Deployment | ||
| UnmarshalK8SYaml(t, tierYaml, &deploymentObj) | ||
| pod := deploymentObj.Spec.Template.Spec | ||
| require.Equal(t, 1, len(pod.Containers)) | ||
| require.Equal(t, "pega-web-tomcat", pod.Containers[0].Name) | ||
| require.Equal(t, "pegasystems/pega", pod.Containers[0].Image) | ||
| require.Equal(t, []string{"sleep", "15"}, pod.Containers[0].Lifecycle.PreStop.Exec.Command) | ||
| } |