Merge pull request #326 from spolti/RHPAM-2401-1

[RHPAM-2401-1] - QE review, db is not ba component
kiegroup · Dec 19, 2019 · 9c9d8fa · 9c9d8fa
2 parents ea0466e + bb942f5
commit 9c9d8fa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/config/7.6.0/dbs/postgresql.yaml b/config/7.6.0/dbs/postgresql.yaml
@@ -63,10 +63,7 @@ servers:
             service: "[[.KieName]]-postgresql"
         spec:
           strategy:
-            rollingParams:
-              maxSurge: 100%
-              maxUnavailable: 0
-            type: Rolling
+            type: Recreate
           triggers:
             - type: ImageChange
               imageChangeParams:

diff --git a/config/7.6.1/dbs/postgresql.yaml b/config/7.6.1/dbs/postgresql.yaml
@@ -63,10 +63,7 @@ servers:
             service: "[[.KieName]]-postgresql"
         spec:
           strategy:
-            rollingParams:
-              maxSurge: 100%
-              maxUnavailable: 0
-            type: Rolling
+            type: Recreate
           triggers:
             - type: ImageChange
               imageChangeParams:

diff --git a/pkg/controller/kieapp/defaults/merge_test.go b/pkg/controller/kieapp/defaults/merge_test.go
@@ -133,8 +133,7 @@ func TestMergeServerDeploymentConfigs(t *testing.T) {
 	var dbEnv api.Environment
 	err := getParsedTemplate("dbs/postgresql.yaml", "prod", &dbEnv)
 	assert.Nil(t, err, "Error: %v", err)
-	assert.Equal(t, appsv1.DeploymentStrategyTypeRolling, dbEnv.Servers[0].DeploymentConfigs[1].Spec.Strategy.Type)
-	assert.Equal(t, &intstr.IntOrString{Type: 1, IntVal: 0, StrVal: "100%"}, dbEnv.Servers[0].DeploymentConfigs[1].Spec.Strategy.RollingParams.MaxSurge)
+	assert.Equal(t, appsv1.DeploymentStrategyTypeRecreate, dbEnv.Servers[0].DeploymentConfigs[1].Spec.Strategy.Type)
 
 	var prodEnv api.Environment
 	err = getParsedTemplate("envs/rhpam-production.yaml", "prod", &prodEnv)