only add ADMIN_PORT_SECURE env var if its value is true

Author: alai8

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

@@ -803,7 +803,9 @@ 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()));
+    if (isLocalAdminProtocolChannelSecure()) {
+      addEnvVar(vars, "ADMIN_PORT_SECURE", "true");
+    }
     addEnvVar(vars, "SERVER_NAME", getServerName());
     addEnvVar(vars, "DOMAIN_UID", getDomainUID());
     addEnvVar(vars, "NODEMGR_HOME", NODEMGR_HOME);

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

@@ -26,6 +26,7 @@
 #                          ${DOMAIN_UID}/${SERVER_NAME}_nodemanager.out
 #                       Default:
 #                          Use LOG_HOME.  If LOG_HOME not set, use NODEMGR_HOME.
+#   ADMIN_PORT_SECURE = "true" if the admin protocol is secure. Default is false
 #
 # If SERVER_NAME is set, then this NM is for a WL Server and these must also be set:
 # 
@@ -51,6 +52,7 @@ export WL_HOME="${WL_HOME:-/u01/oracle/wlserver}"
 stm_script=${WL_HOME}/server/bin/startNodeManager.sh
 
 SERVER_NAME=${SERVER_NAME:-introspector}
+ADMIN_PORT_SECURE=${ADMIN_PORT_SECURE:-false}
 
 trace "Starting node manager for domain-uid='$DOMAIN_UID' and server='$SERVER_NAME'."
 

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

@@ -172,7 +172,6 @@ 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

@@ -443,7 +443,6 @@ 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),
@@ -933,7 +932,6 @@ 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))