Change temporal.kube_env to append

Signed-off-by: Mustafa Gezen <mustafa@ctrliq.com>
This commit is contained in:
Mustafa Gezen 2022-07-30 00:54:10 +02:00
parent 7885a467e9
commit d171e12eb1
Signed by untrusted user who does not match committer: mustafa
GPG Key ID: DCDF010D946438C1
4 changed files with 13 additions and 11 deletions

View File

@ -81,7 +81,6 @@ bycdeploy.new({
name: 'KEYKEEPER_S3_BUCKET', name: 'KEYKEEPER_S3_BUCKET',
value: 'resf-peridot-prod', value: 'resf-peridot-prod',
}, },
temporal.kube_env('KEYKEEPER'),
$.dsn, $.dsn,
], ] + temporal.kube_env('KEYKEEPER'),
}) })

View File

@ -107,10 +107,6 @@ bycdeploy.new({
name: 'YUMREPOFS_HTTP_ENDPOINT_OVERRIDE', name: 'YUMREPOFS_HTTP_ENDPOINT_OVERRIDE',
value: 'https://yumrepofs.build.resf.org', value: 'https://yumrepofs.build.resf.org',
}, },
if site == 'extarches' then {
name: 'PERIDOTEPHEMERAL_TEMPORAL_HOSTPORT',
value: 'temporal.corp.build.resf.org:443',
} else temporal.kube_env('PERIDOTEPHEMERAL'),
if site == 'extarches' then { if site == 'extarches' then {
name: 'PERIDOTEPHEMERAL_PROVISION_ONLY', name: 'PERIDOTEPHEMERAL_PROVISION_ONLY',
value: 'true', value: 'true',
@ -136,7 +132,16 @@ bycdeploy.new({
}, },
}, },
$.dsn, $.dsn,
], ] + if site == 'extarches' then [
{
name: 'PERIDOTEPHEMERAL_TEMPORAL_HOSTPORT',
value: 'temporal.corp.build.resf.org:443',
},
{
name: 'TEMPORAL_NAMESPACE',
value: 'default',
},
] else temporal.kube_env('PERIDOTEPHEMERAL'),
custom_job_items(metadata, extra): [ custom_job_items(metadata, extra): [
provisionWorkerRole(metadata), provisionWorkerRole(metadata),
kubernetes.bind_to_role_sa(provisionWorkerRole(metadata), extra.service_account_name) kubernetes.bind_to_role_sa(provisionWorkerRole(metadata), extra.service_account_name)

View File

@ -50,7 +50,6 @@ bycdeploy.new({
name: 'PERIDOT_PRODUCTION', name: 'PERIDOT_PRODUCTION',
value: if kubernetes.dev() then 'false' else 'true', value: if kubernetes.dev() then 'false' else 'true',
}, },
temporal.kube_env('PERIDOT'),
$.dsn, $.dsn,
], ] + temporal.kube_env('PERIDOT'),
}) })

View File

@ -68,7 +68,6 @@ bycdeploy.new({
name: 'YUMREPOFSUPDATER_S3_BUCKET', name: 'YUMREPOFSUPDATER_S3_BUCKET',
value: 'resf-peridot-prod', value: 'resf-peridot-prod',
}, },
temporal.kube_env('YUMREPOFSUPDATER'),
$.dsn, $.dsn,
], ] + temporal.kube_env('YUMREPOFSUPDATER'),
}) })