rocky-linux/peridot
4
0
Fork 0
mirror of https://github.com/rocky-linux/peridot.git synced 2024-12-18 17:08:29 +00:00
Code Issues Projects Releases Activity

Merge pull request #21 from mstg/change-temporal-kubeenv-array

Browse Source 
Change temporal.kube_env to append
This commit is contained in:
Mustafa Gezen 2022-07-30 01:02:05 +02:00 committed by GitHub
commit c5ad1e5742
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/temporal.jsonnet
View File

@ -6,7 +6,7 @@ local utils = import 'ci/utils.jsonnet';
{ {
name: '%s_TEMPORAL_HOSTPORT' % prefix, name: '%s_TEMPORAL_HOSTPORT' % prefix,
value: $.hostport, value: $.hostport,
} },
{ {
name: 'TEMPORAL_NAMESPACE', name: 'TEMPORAL_NAMESPACE',
value: if utils.helm_mode then '{{ .Values.temporalNamespace | default !"!" }}' else 'default', value: if utils.helm_mode then '{{ .Values.temporalNamespace | default !"!" }}' else 'default',

3
peridot/cmd/v1/keykeeper/ci/deploy.jsonnet
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'),
}) })

15
peridot/cmd/v1/peridotephemeral/ci/deploy.jsonnet
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)

3
peridot/cmd/v1/peridotserver/ci/deploy.jsonnet
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'),
}) })

3
peridot/cmd/v1/yumrepofsupdater/ci/deploy.jsonnet
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'),
}) })