rocky-linux
/
peridot
mirror of https://github.com/rocky-linux/peridot.git
4
0
Fork 0
Code Issues Projects Releases Activity

Fix resfdeploy deployment

This commit is contained in:
Mustafa Gezen 2022-11-01 04:45:12 +01:00
parent 6f9ad97063
commit a15e184cf3
Signed by untrusted user who does not match committer: mustafa
GPG Key ID: DCDF010D946438C1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/kubernetes.jsonnet
View File

@ -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,
};

4
ci/resfdeploy.jsonnet
View File

@ -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: [