Skip to content

Commit 21fe3b4

Browse files
committed
Updates based on 1st round of review comments
1 parent 6e6f449 commit 21fe3b4

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ Integer getAsPort() {
150150
*/
151151
boolean isLocalAdminProtocolChannelSecure() {
152152
return domainTopology
153-
.getServerConfig(domainTopology.getAdminServerName())
153+
.getServerConfig(getServerName())
154154
.isLocalAdminProtocolChannelSecure();
155155
}
156156

@@ -620,6 +620,7 @@ void overrideContainerWeblogicEnvVars(List<V1EnvVar> vars) {
620620
addEnvVar(vars, "ADMIN_NAME", getAsName());
621621
addEnvVar(vars, "ADMIN_PORT", getAsPort().toString());
622622
if (isLocalAdminProtocolChannelSecure()) {
623+
// This env variable indicates whether the administration port in the WLS server on the local pod is secure
623624
addEnvVar(vars, "ADMIN_PORT_SECURE", "true");
624625
}
625626
if (isAdminServerProtocolChannelSecure()) {

operator/src/main/resources/scripts/startNodeManager.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ EOF
260260
[ ! $? -eq 0 ] && trace SEVERE "Failed to create '${wl_props_file}'." && exit 1
261261

262262
if [ ! "${ADMIN_NAME}" = "${SERVER_NAME}" ]; then
263-
ADMIN_URL=$(getAdminUrl)
263+
ADMIN_URL=$(getAdminServerUrl)
264264
echo "AdminURL=$ADMIN_URL" >> ${wl_props_file}
265265
fi
266266
fi

operator/src/main/resources/scripts/utils.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -399,12 +399,12 @@ checkWebLogicVersion()
399399

400400
#
401401
# getAdminUrl
402-
# purpose: Get the ADMIN_URL used to connect to the admin server internally, e.g. when starting a managed server
402+
# purpose: Get the admin URL used to connect to the admin server internally, e.g. when starting a managed server
403403
# sample:
404-
# ADMIN_URL=$(getAdminUrl)
404+
# ADMIN_URL=$(getAdminServerUrl)
405405
#
406-
function getAdminUrl() {
407-
admin_protocol="http"
406+
function getAdminServerUrl() {
407+
local admin_protocol="http"
408408
if [ "${ISTIO_ENABLED}" = "true" ]; then
409409
admin_protocol="t3"
410410
fi

0 commit comments

Comments
 (0)