Skip to content

Commit 2ee42f0

Browse files
galiachenggaliacheng
committed
On branch e2etest: output secured urls exposed by Lb service.
Signed-off-by: galiacheng <[email protected]> Changes to be committed: modified: weblogic-azure-aks/src/main/arm/scripts/createLbSvc.sh modified: weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-networking.bicep modified: weblogic-azure-aks/src/main/bicep/modules/networking.bicep
1 parent cbf3458 commit 2ee42f0

File tree

3 files changed

+50
-13
lines changed

3 files changed

+50
-13
lines changed

‎weblogic-azure-aks/src/main/arm/scripts/createLbSvc.sh‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,14 @@ function create_lb_svc_for_admin_server_default_channel() {
180180

181181
adminServerEndpoint=$(kubectl get svc ${adminServerLBSVCName} -n ${wlsDomainNS} \
182182
-o=jsonpath='{.status.loadBalancer.ingress[0].ip}:{.spec.ports[0].port}')
183-
adminConsoleEndpoint="${adminServerEndpoint}/console"
184183

185184
if [ "${enableCustomDNSAlias,,}" == "true" ]; then
186185
create_dns_A_record "${adminServerEndpoint%%:*}" ${dnsAdminLabel} ${dnsRGName} ${dnsZoneName}
187-
adminConsoleEndpoint="${dnsAdminLabel}.${dnsZoneName}:${adminServerEndpoint#*:}/console"
186+
adminServerEndpoint="${dnsAdminLabel}.${dnsZoneName}:${adminServerEndpoint#*:}"
188187
fi
188+
189+
adminConsoleEndpoint="${adminServerEndpoint}/console"
190+
adminRemoteEndpoint=${adminServerEndpoint}
189191
}
190192

191193
function create_lb_svc_for_admin_t3_channel() {
@@ -360,19 +362,48 @@ EOF
360362
fi
361363
}
362364

365+
function validate_admin_console_url() {
366+
local podName=$(kubectl -n ${wlsDomainNS} get pod -l weblogic.serverName=${constAdminServerName} -o json |
367+
jq '.items[0] | .metadata.name' |
368+
tr -d "\"")
369+
370+
if [[ "${podName}" == "null" ]]; then
371+
echo "Ensure your domain has at least one admin server."
372+
exit 1
373+
fi
374+
375+
adminTargetPort=$(kubectl get svc ${svcAdminServer} -n ${wlsDomainNS} -o json |
376+
jq '.spec.ports[] | select(.name=="default") | .port')
377+
local adminConsoleUrl="http://${svcAdminServer}.${wlsDomainNS}:${adminTargetPort}/console/"
378+
379+
kubectl exec -it ${podName} -n ${wlsDomainNS} -c ${wlsContainerName} \
380+
-- bash -c 'curl --write-out "%{http_code}\n" --silent --output /dev/null "'${adminConsoleUrl}'" | grep "302"'
381+
382+
if [ $? == 1 ]; then
383+
echo "admin console is not accessible."
384+
# reset admin console endpoint
385+
adminConsoleEndpoint="null"
386+
fi
387+
}
388+
363389
#Output value to deployment scripts
364390
function output_result() {
365391
echo ${adminConsoleEndpoint}
366392
echo ${clusterEndpoint}
367393
echo ${adminServerT3Endpoint}
368394
echo ${clusterT3Endpoint}
395+
echo ${adminRemoteEndpoint}
396+
397+
# check if the admin console is accessible, do not output it
398+
validate_admin_console_url
369399

370400
result=$(jq -n -c \
371401
--arg adminEndpoint $adminConsoleEndpoint \
372402
--arg clusterEndpoint $clusterEndpoint \
373403
--arg adminT3Endpoint $adminServerT3Endpoint \
374404
--arg clusterT3Endpoint $clusterT3Endpoint \
375-
'{adminConsoleEndpoint: $adminEndpoint, clusterEndpoint: $clusterEndpoint, adminServerT3Endpoint: $adminT3Endpoint, clusterT3Endpoint: $clusterT3Endpoint}')
405+
--arg adminRemoteEndpoint ${adminRemoteEndpoint} \
406+
'{adminConsoleEndpoint: $adminEndpoint, clusterEndpoint: $clusterEndpoint, adminServerT3Endpoint: $adminT3Endpoint, clusterT3Endpoint: $clusterT3Endpoint, adminRemoteEndpoint: $adminRemoteEndpoint}')
376407
echo "result is: $result"
377408
echo $result >$AZ_SCRIPTS_OUTPUT_PATH
378409
}
@@ -461,6 +492,7 @@ wlsDomainUID=${11}
461492
adminConsoleEndpoint="null"
462493
adminServerName=${constAdminServerName} # define in common.sh
463494
adminServerT3Endpoint="null"
495+
adminRemoteEndpoint="null"
464496
clusterEndpoint="null"
465497
clusterName=${constClusterName}
466498
clusterT3Endpoint="null"

‎weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-networking.bicep‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ var const_scriptLocation = uri(_artifactsLocation, 'scripts/')
5454
var const_setupNetworkingScript= 'setupNetworking.sh'
5555
var const_primaryScript = 'invokeSetupNetworking.sh'
5656
var const_utilityScript= 'utility.sh'
57+
var name_deploymentName='ds-networking-deployment'
5758

5859
resource deploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' = {
5960
name: 'ds-networking-deployment'
@@ -80,8 +81,12 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' = {
8081
}
8182
}
8283

83-
output adminConsoleLBUrl string = length(lbSvcValues) > 0 && (reference('ds-networking-deployment').outputs.adminConsoleEndpoint != 'null') ? format('http://{0}/',reference('ds-networking-deployment').outputs.adminConsoleEndpoint): ''
84-
output adminServerT3LBUrl string = length(lbSvcValues) > 0 && (reference('ds-networking-deployment').outputs.adminServerT3Endpoint != 'null') ? reference('ds-networking-deployment').outputs.adminServerT3Endpoint: ''
85-
output clusterLBUrl string = length(lbSvcValues) > 0 && (reference('ds-networking-deployment').outputs.clusterEndpoint != 'null') ? format('http://{0}/',reference('ds-networking-deployment').outputs.clusterEndpoint): ''
86-
output clusterT3LBUrl string = length(lbSvcValues) > 0 && (reference('ds-networking-deployment').outputs.clusterT3Endpoint != 'null') ? reference('ds-networking-deployment').outputs.clusterT3Endpoint: ''
84+
output adminConsoleLBUrl string = (!enableCustomSSL) && length(lbSvcValues) > 0 && (reference(name_deploymentName).outputs.adminConsoleEndpoint != 'null') ? format('http://{0}/',reference(name_deploymentName).outputs.adminConsoleEndpoint): ''
85+
output adminConsoleLBSecuredUrl string = enableCustomSSL && length(lbSvcValues) > 0 && (reference(name_deploymentName).outputs.adminConsoleEndpoint != 'null') ? format('https://{0}/',reference(name_deploymentName).outputs.adminConsoleEndpoint): ''
86+
output adminServerT3LBUrl string = length(lbSvcValues) > 0 && (reference(name_deploymentName).outputs.adminServerT3Endpoint != 'null') ? reference(name_deploymentName).outputs.adminServerT3Endpoint: ''
87+
output adminRemoteUrl string = (!enableCustomSSL) && length(lbSvcValues) > 0 && (reference(name_deploymentName).outputs.adminRemoteEndpoint != 'null') ? format('http://{0}',reference(name_deploymentName).outputs.adminRemoteEndpoint): ''
88+
output adminRemoteSecuredUrl string = enableCustomSSL && length(lbSvcValues) > 0 && (reference(name_deploymentName).outputs.adminRemoteEndpoint != 'null') ? format('https://{0}',reference(name_deploymentName).outputs.adminRemoteEndpoint): ''
89+
output clusterLBUrl string = (!enableCustomSSL) && length(lbSvcValues) > 0 && (reference(name_deploymentName).outputs.clusterEndpoint != 'null') ? format('https://{0}/',reference(name_deploymentName).outputs.clusterEndpoint): ''
90+
output clusterLBSecuredUrl string = enableCustomSSL && length(lbSvcValues) > 0 && (reference(name_deploymentName).outputs.clusterEndpoint != 'null') ? format('http://{0}/',reference(name_deploymentName).outputs.clusterEndpoint): ''
91+
output clusterT3LBUrl string = length(lbSvcValues) > 0 && (reference(name_deploymentName).outputs.clusterT3Endpoint != 'null') ? reference(name_deploymentName).outputs.clusterT3Endpoint: ''
8792

‎weblogic-azure-aks/src/main/bicep/modules/networking.bicep‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -269,11 +269,11 @@ module pidNetworkingEnd './_pids/_pid.bicep' = {
269269
]
270270
}
271271

272-
output adminConsoleExternalUrl string = enableAppGWIngress ? (enableDNSConfiguration ? format('http://{0}console', const_appgwAdminCustomDNSAlias) : format('http://{0}/console', appgwDeployment.outputs.appGatewayAlias)) : networkingDeployment3.outputs.adminConsoleLBUrl
273-
output adminConsoleExternalSecuredUrl string = enableAppGWIngress && enableCustomSSL && enableDNSConfiguration ? format('https://{0}console', const_appgwAdminCustomDNSAlias) : ''
274-
output adminRemoteConsoleUrl string = enableAppGWIngress ? (enableDNSConfiguration ? format('http://{0}remoteconsole', const_appgwAdminCustomDNSAlias) : format('http://{0}/remoteconsole', appgwDeployment.outputs.appGatewayAlias)) : replace(networkingDeployment3.outputs.adminConsoleLBUrl, '/console/', '')
275-
output adminRemoteConsoleSecuredUrl string = enableAppGWIngress && enableCustomSSL && enableDNSConfiguration ? format('https://{0}remoteconsole', const_appgwAdminCustomDNSAlias) : ''
272+
output adminConsoleExternalUrl string = enableAppGWIngress ? (enableDNSConfiguration ? format('http://{0}console', const_appgwAdminCustomDNSAlias) : format('http://{0}/console', appgwDeployment.outputs.appGatewayAlias)) : ref_networkDeployment.outputs.adminConsoleLBUrl
273+
output adminConsoleExternalSecuredUrl string = enableAppGWIngress && enableCustomSSL && enableDNSConfiguration ? format('https://{0}console', const_appgwAdminCustomDNSAlias) : ref_networkDeployment.outputs.adminConsoleLBSecuredUrl
274+
output adminRemoteConsoleUrl string = enableAppGWIngress ? (enableDNSConfiguration ? format('http://{0}remoteconsole', const_appgwAdminCustomDNSAlias) : format('http://{0}/remoteconsole', appgwDeployment.outputs.appGatewayAlias)) : ref_networkDeployment.outputs.adminRemoteUrl
275+
output adminRemoteConsoleSecuredUrl string = enableAppGWIngress && enableCustomSSL && enableDNSConfiguration ? format('https://{0}remoteconsole', const_appgwAdminCustomDNSAlias) : ref_networkDeployment.outputs.adminRemoteSecuredUrl
276276
output adminServerT3ChannelUrl string = ref_networkDeployment.outputs.adminServerT3LBUrl.value
277-
output clusterExternalUrl string = enableAppGWIngress ? (enableDNSConfiguration ? format('http://{0}', const_appgwCustomDNSAlias) : appgwDeployment.outputs.appGatewayURL) : networkingDeployment3.outputs.clusterLBUrl
278-
output clusterExternalSecuredUrl string = enableAppGWIngress ? (enableDNSConfiguration ? format('https://{0}', const_appgwCustomDNSAlias) : appgwDeployment.outputs.appGatewaySecuredURL) : ''
277+
output clusterExternalUrl string = enableAppGWIngress ? (enableDNSConfiguration ? format('http://{0}', const_appgwCustomDNSAlias) : appgwDeployment.outputs.appGatewayURL) : ref_networkDeployment.outputs.clusterLBUrl
278+
output clusterExternalSecuredUrl string = enableAppGWIngress ? (enableDNSConfiguration ? format('https://{0}', const_appgwCustomDNSAlias) : appgwDeployment.outputs.appGatewaySecuredURL) : ref_networkDeployment.outputs.clusterLBSecuredUrl
279279
output clusterT3ChannelUrl string = ref_networkDeployment.outputs.clusterT3LBUrl.value

0 commit comments

Comments
 (0)