From a15e184cf363f0fda461bb42dd797c0da2af43f8 Mon Sep 17 00:00:00 2001 From: Mustafa Gezen Date: Tue, 1 Nov 2022 04:45:12 +0100 Subject: [PATCH] Fix resfdeploy deployment --- ci/kubernetes.jsonnet | 2 +- ci/resfdeploy.jsonnet | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/kubernetes.jsonnet b/ci/kubernetes.jsonnet index aab09df..1d19a92 100644 --- a/ci/kubernetes.jsonnet +++ b/ci/kubernetes.jsonnet @@ -140,7 +140,7 @@ local dev() = stage == '-dev'; env: if !std.objectHas(deporig, 'env') then [] else deporig.env, ports: if !std.objectHas(deporig, 'ports') then [{ containerPort: 80, protocol: 'TCP' }] else deporig.ports, initContainers: if !std.objectHas(deporig, 'initContainers') then [] else deporig.initContainers, - limits: if !std.objectHas(deporig, 'limits') || deporig.limits == null then { cpu: '0.1', memory: '256M' } else deporig.limits, + limits: if !std.objectHas(deporig, 'limits') || deporig.limits == null then null else deporig.limits, requests: if !std.objectHas(deporig, 'requests') || deporig.requests == null then { cpu: '0.001', memory: '128M' } else deporig.requests, }; diff --git a/ci/resfdeploy.jsonnet b/ci/resfdeploy.jsonnet index 665c66e..cb4654f 100644 --- a/ci/resfdeploy.jsonnet +++ b/ci/resfdeploy.jsonnet @@ -79,7 +79,7 @@ local manifestYamlStream = function (value, indent_array_in_object=false, c_docu secret: if !utils.local_image then { name: '%s-database-password' % db.staged_name(dbname), key: 'password', - optional: '{{ if .Values.databaseUrl }}true{{ else }}false{{ end }}', + optional: if utils.helm_mode then '{{ if .Values.databaseUrl }}true{{ else }}false{{ end }}' else false, }, }; @@ -192,7 +192,7 @@ local manifestYamlStream = function (value, indent_array_in_object=false, c_docu initContainers: [ { name: 'initdb', - image: 'quay.io/peridot/initdb:v0.1.5', + image: 'quay.io/peridot/initdb:v0.1.6', command: ['/bin/sh'], args: ['-c', '/bundle/initdb*'], env: [