From ccdbbcdceb0c40fb99dd836f5503aabef0bc97c1 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 25 Jul 2023 13:13:12 -0400 Subject: [PATCH 1/3] Fixed env merging to wrong part of yaml heirarchy Signed-off-by: 1000TurquoisePogs --- lib/zluxArgs.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/zluxArgs.js b/lib/zluxArgs.js index c914fe7..8f2b3ab 100644 --- a/lib/zluxArgs.js +++ b/lib/zluxArgs.js @@ -62,13 +62,13 @@ if(process.env.overrideFileConfig !== "false"){ if (cluster.isMaster) { console.log('\nZWED5015I - Processed environment variables:\n'+JSON.stringify(envConfig, null, 2)); } - configJSON = mergeUtils.deepAssign(configJSON, envConfig); + configJSON = mergeUtils.deepAssign(configJSON.components['app-server'], envConfig); } if (userInput.D) { if (cluster.isMaster) { console.log('\nZWED5016I - Processed -D arguments:\n'+JSON.stringify(userInput.D, null, 2)); } - configJSON = mergeUtils.deepAssign(configJSON, userInput.D); + configJSON = mergeUtils.deepAssign(configJSON.components['app-server'], userInput.D); } } else { console.log("ZWED5017I - Using config JSON, discarding CLI args"); From 124c41dca82d305124324c00d7c36bfd301d6d68 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 25 Jul 2023 13:47:08 -0400 Subject: [PATCH 2/3] Update defaults.yaml Signed-off-by: 1000TurquoisePogs --- defaults/serverConfig/defaults.yaml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/defaults/serverConfig/defaults.yaml b/defaults/serverConfig/defaults.yaml index 6a0451f..be52ffe 100644 --- a/defaults/serverConfig/defaults.yaml +++ b/defaults/serverConfig/defaults.yaml @@ -57,8 +57,22 @@ components: loopbackAddress: "${{ function a(){ if (process.env.ZOWE_LOOPBACK_ADDRESS) { return process.env.ZOWE_LOOPBACK_ADDRESS; } else { return undefined; } }; a() }}" mediationLayer: server: - hostname: ${{ zowe.externalDomains[0] }} - gatewayHostname: ${{ zowe.externalDomains[0] }} + # if ZWE_DISCOVERY_SERVICES_LIST exists, its more accurate than zowe.externalDomains, as that doesn't handle containers well. + # if exists, its in the format of "https://discovery-0.discovery-service.zowe.svc.cluster.local:7553/eureka/" + hostname: '${{ function a() { + if (process.env.ZWE_DISCOVERY_SERVICES_LIST) { + return process.env.ZWE_DISCOVERY_SERVICES_LIST.split(",")[0].split("/")[2].split(":")[0]; + } else { + return zowe.externalDomains[0] } }; + a() }}' + # usually, externalDomains is where gateway is. But on containers, this isnt accessible to containers, so + # HACK: special var ZWE_GATEWAY_HOST is used instead + gatewayHostname: '${{ function a() { + if (process.env.ZWED_node_container=="true" && process.env.ZWE_GATEWAY_HOST) { + return process.env.ZWE_GATEWAY_HOST; + } else { + return zowe.externalDomains[0] } }; + a() }}' port: ${{ components.discovery.port }} gatewayPort: ${{ zowe.externalPort }} isHttps: true From 2d01cd49a94654f8b3b93051ca3587ff16aea9c6 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 25 Jul 2023 14:35:37 -0400 Subject: [PATCH 3/3] correct zlux and component path for containers zlux_path was not set in containers other than app-server, causing install-app.sh to fail outside it for external plugins. Signed-off-by: 1000TurquoisePogs --- bin/install-app.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/install-app.sh b/bin/install-app.sh index b535c3d..9e35f54 100755 --- a/bin/install-app.sh +++ b/bin/install-app.sh @@ -30,10 +30,13 @@ if [ -n "${ZWE_zowe_workspaceDirectory}" -a -n "${ZWE_zowe_runtimeDirectory}" ]; ZLUX_CONTAINER_MODE=1 INSTALL_NO_NODE=1 fi + if [ ! -d "${COMPONENT_HOME}/share/zlux-app-server" ]; then + COMPONENT_HOME=${ZWE_zowe_runtimeDirectory}/components/app-server + fi fi + zlux_path="$COMPONENT_HOME/share" if [ -z "$INSTALL_NO_NODE" ]; then - zlux_path="$COMPONENT_HOME/share" setVars if [ ! -e "${ZWE_zowe_workspaceDirectory}/app-server/plugins/org.zowe.zlux.json" ]; then cd ${zlux_path}/zlux-app-server/lib