managed server should use admin port to reach admin server if admin port is enabled

Author: alai8

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

@@ -158,7 +158,9 @@ String getAsName() {
   }
 
   Integer getAsPort() {
-    return domainTopology.getServerConfig(domainTopology.getAdminServerName()).getListenPort();
+    return domainTopology
+        .getServerConfig(domainTopology.getAdminServerName())
+        .getLocalAdminProtocolChannelPort();
   }
 
   boolean isLocalAdminProtocolChannelSecure() {
@@ -769,6 +771,7 @@ void overrideContainerWeblogicEnvVars(List<V1EnvVar> vars) {
     addEnvVar(vars, "DOMAIN_HOME", getDomainHome());
     addEnvVar(vars, "ADMIN_NAME", getAsName());
     addEnvVar(vars, "ADMIN_PORT", getAsPort().toString());
+    addEnvVar(vars, "ADMIN_PORT_SECURE", Boolean.toString(isLocalAdminProtocolChannelSecure()));
     addEnvVar(vars, "SERVER_NAME", getServerName());
     addEnvVar(vars, "DOMAIN_UID", getDomainUID());
     addEnvVar(vars, "NODEMGR_HOME", NODEMGR_HOME);

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

@@ -244,7 +244,11 @@ EOF
   [ ! $? -eq 0 ] && trace "Failed to create '${wl_props_file}'." && exit 1
 
   if [ ! "${ADMIN_NAME}" = "${SERVER_NAME}" ]; then
-    echo "AdminURL=http\\://${AS_SERVICE_NAME}\\:${ADMIN_PORT}" >> ${wl_props_file}
+    admin_protocol="http"
+    if [ "${ADMIN_PORT_SECURE}" = "true" ]; then
+      admin_protocol="https"
+    fi  
+    echo "AdminURL=$admin_protocol\\://${AS_SERVICE_NAME}\\:${ADMIN_PORT}" >> ${wl_props_file}
   fi
 fi
 

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

@@ -174,6 +174,7 @@ checkEnv \
   SERVICE_NAME \
   ADMIN_NAME \
   ADMIN_PORT \
+  ADMIN_PORT_SECURE \
   SERVER_OUT_IN_POD_LOG \
   AS_SERVICE_NAME || exitOrLoop
 

operator/src/test/java/oracle/kubernetes/operator/helpers/PodHelperTestBase.java

@@ -431,6 +431,7 @@ public void whenPodCreated_hasPredefinedEnvVariables() {
             hasEnvVar("DOMAIN_HOME", "/u01/oracle/user_projects/domains"),
             hasEnvVar("ADMIN_NAME", ADMIN_SERVER),
             hasEnvVar("ADMIN_PORT", Integer.toString(ADMIN_PORT)),
+            hasEnvVar("ADMIN_PORT_SECURE", "false"),
             hasEnvVar("SERVER_NAME", getServerName()),
             hasEnvVar("ADMIN_USERNAME", null),
             hasEnvVar("ADMIN_PASSWORD", null),
@@ -920,6 +921,7 @@ V1Container createPodSpecContainer() {
         .addEnvItem(envItem("DOMAIN_HOME", "/u01/oracle/user_projects/domains"))
         .addEnvItem(envItem("ADMIN_NAME", ADMIN_SERVER))
         .addEnvItem(envItem("ADMIN_PORT", Integer.toString(ADMIN_PORT)))
+        .addEnvItem(envItem("ADMIN_PORT_SECURE", "false"))
         .addEnvItem(envItem("SERVER_NAME", getServerName()))
         .addEnvItem(envItem("ADMIN_USERNAME", null))
         .addEnvItem(envItem("ADMIN_PASSWORD", null))