From dfe1fb4bd3f5281f467339f97c825eec5194885e Mon Sep 17 00:00:00 2001 From: Mustafa Gezen Date: Sat, 30 Jul 2022 00:34:51 +0200 Subject: [PATCH 1/2] Use default namespace if not specified for Temporal in non-Helm mode Signed-off-by: Mustafa Gezen --- ci/temporal.jsonnet | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ci/temporal.jsonnet b/ci/temporal.jsonnet index 2175624..33ad115 100644 --- a/ci/temporal.jsonnet +++ b/ci/temporal.jsonnet @@ -2,8 +2,14 @@ local utils = import 'ci/utils.jsonnet'; { hostport: if utils.local_image then 'temporal-frontend.default.svc.cluster.local:7233' else 'workflow-temporal-frontend.workflow.svc.cluster.local:7233', - kube_env(prefix): { - name: '%s_TEMPORAL_HOSTPORT' % prefix, - value: $.hostport, - } + kube_env(prefix): [ + { + name: '%s_TEMPORAL_HOSTPORT' % prefix, + value: $.hostport, + } + { + name: 'TEMPORAL_NAMESPACE', + value: if utils.helm_mode then '{{ .Values.temporalNamespace | default !"!" }}' else 'default', + }, + ], } From 31a10d361981cb5209bf8b1e2af6bc458097f44d Mon Sep 17 00:00:00 2001 From: Mustafa Gezen Date: Sat, 30 Jul 2022 00:43:41 +0200 Subject: [PATCH 2/2] Add temporary helm_mode variable Signed-off-by: Mustafa Gezen --- ci/utils.jsonnet | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/utils.jsonnet b/ci/utils.jsonnet index e4db85f..a5c0180 100644 --- a/ci/utils.jsonnet +++ b/ci/utils.jsonnet @@ -7,4 +7,5 @@ local localImage = if localEnvironment == "1" then true else false; { local_image: localImage, docker_hub_image(name): "%s/%s" % [ociRegistryDocker, name], + helm_mode: false, }