From 1a4c7ad928188683b2e5baaea329250b99f796ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Mon, 8 Mar 2021 10:58:57 +0100 Subject: [PATCH] Trying to enable back connection on admin from develop, knowing that the develop certificate is broken --- deeployer.libsonnet | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/deeployer.libsonnet b/deeployer.libsonnet index 5093c86a..b9df3294 100644 --- a/deeployer.libsonnet +++ b/deeployer.libsonnet @@ -4,7 +4,7 @@ local tag = namespace, local url = if namespace == "master" then "workadventu.re" else namespace+".workadventure.test.thecodingmachine.com", // develop branch does not use admin because of issue with SSL certificate of admin as of now. - local adminUrl = if namespace == "master" /*|| namespace == "develop"*/ || std.startsWith(namespace, "admin") then "https://"+url else null, + local adminUrl = if namespace == "master" || namespace == "develop" || std.startsWith(namespace, "admin") then "https://"+url else null, "$schema": "https://raw.githubusercontent.com/thecodingmachine/deeployer/master/deeployer.schema.json", "version": "1.0", "containers": { @@ -25,7 +25,10 @@ "TURN_STATIC_AUTH_SECRET": env.TURN_STATIC_AUTH_SECRET, } + if adminUrl != null then { "ADMIN_API_URL": adminUrl, - } else {} + } else {} + if namespace != "master" then { + // Absolutely ugly WorkAround to circumvent broken certificates on the K8S test cluster. Don't do this in production kids! + "NODE_TLS_REJECT_UNAUTHORIZED": "0" + } }, "back2": { "image": "thecodingmachine/workadventure-back:"+tag, @@ -44,7 +47,10 @@ "TURN_STATIC_AUTH_SECRET": env.TURN_STATIC_AUTH_SECRET, } + if adminUrl != null then { "ADMIN_API_URL": adminUrl, - } else {} + } else {} + if namespace != "master" then { + // Absolutely ugly WorkAround to circumvent broken certificates on the K8S test cluster. Don't do this in production kids! + "NODE_TLS_REJECT_UNAUTHORIZED": "0" + } }, "pusher": { "replicas": 2, @@ -63,7 +69,10 @@ "SECRET_JITSI_KEY": env.SECRET_JITSI_KEY, } + if adminUrl != null then { "ADMIN_API_URL": adminUrl, - } else {} + } else {} + if namespace != "master" then { + // Absolutely ugly WorkAround to circumvent broken certificates on the K8S test cluster. Don't do this in production kids! + "NODE_TLS_REJECT_UNAUTHORIZED": "0" + } }, "front": { "image": "thecodingmachine/workadventure-front:"+tag,