Merge branch 'master' into chore/add-maintenance-page-alt-text

uc-cdis · Mar 13, 2024 · 32769a9 · 32769a9
2 parents 212e4b5 + 24492c2
commit 32769a9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/gen3/bin/kube-setup-revproxy.sh b/gen3/bin/kube-setup-revproxy.sh
@@ -114,8 +114,8 @@ done
 
 if g3k_manifest_lookup .argo.argo_server_service_url 2> /dev/null; then
   argo_server_service_url=$(g3k_manifest_lookup .argo.argo_server_service_url)
-  g3k_kv_filter "${scriptDir}/gen3.nginx.conf/argo-server.conf" SERVICE_URL "${argo_server_service_url}" > /tmp/argo-server-with-url.conf
-  filePath="/tmp/argo-server-with-url.conf"
+  g3k_kv_filter "${scriptDir}/gen3.nginx.conf/argo-server.conf" SERVICE_URL "${argo_server_service_url}" > /tmp/argo-server-with-url$(gen3 db namespace).conf
+  filePath="/tmp/argo-server-with-url$(gen3 db namespace).conf"
   if [[ -f "$filePath" ]]; then
     confFileList+=("--from-file" "$filePath")
   fi