[GOG-162] Fix review environment configuration (#762)

powerhome · May 13, 2020 · 8ffa855 · 8ffa855
1 parent 52d4a91
commit 8ffa855
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -11,7 +11,7 @@ app.build(
     requestCpu: '1',
     limitCpu: '2',
     requestMemory: '6Gi',
-    limitMemory: '12Gi',
+    limitMemory: '14Gi',
   ]
 ) {
   def scmVars

diff --git a/bin/deploy b/bin/deploy
@@ -23,13 +23,13 @@ extraBindings="{\"ingress\":{\"hosts\":[\"${deploy_url}\"]}}"
 
 krane render \
     --filenames=${workDir}/config/deploy/templates \
-    --bindings="@${workDir}/config/deploy/values.yaml" "@${workDir}/config/deploy/${environment}/values.yaml" "@${workDir}/config/deploy/${environment}/secrets.dec.yaml" "image_tag=${tag}" "environment=${environment}" $extraBindings \
+    --bindings="@${workDir}/config/deploy/values.yaml" $environmentValuesFile $environmentSecretsFile "image_tag=${tag}" "environment=${environment}" $extraBindings \
     --current-sha=${tag} | krane deploy playbook-${environment} ${cluster} \
     --selector='app=playbook' \
     --verbose-log-prefix \
     --stdin
 
 deploy_exit=$?
-rm ${workDir}/config/deploy/${environment}/secrets.dec.yaml
+rm ${workDir}/config/deploy/**/*.dec.yaml
 
 exit $deploy_exit
diff --git a/config/deploy/production/values.yaml b/config/deploy/production/values.yaml
@@ -1 +1 @@
----
+{}
diff --git a/config/deploy/prs/values.yaml b/config/deploy/prs/values.yaml
@@ -1 +1 @@
----
+{}
diff --git a/config/deploy/staging/values.yaml b/config/deploy/staging/values.yaml
@@ -1 +1 @@
----
+{}