readiness probe to use admin port if administration port is enabled

Author: alai8

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

@@ -289,6 +289,16 @@ protected Map<String, String> getPodAnnotations() {
       return getServerSpec().getPodAnnotations();
     }
 
+    @Override
+    boolean isLocalAdminProtocolChannelSecure() {
+      return scan.isLocalAdminProtocolChannelSecure();
+    }
+
+    @Override
+    Integer getLocalAdminProtocolChannelPort() {
+      return scan.getLocalAdminProtocolChannelPort();
+    }
+
     @Override
     Integer getDefaultPort() {
       return scan.getListenPort();

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

@@ -161,6 +161,18 @@ Integer getAsPort() {
     return domainTopology.getServerConfig(domainTopology.getAdminServerName()).getListenPort();
   }
 
+  boolean isLocalAdminProtocolChannelSecure() {
+    return domainTopology
+        .getServerConfig(domainTopology.getAdminServerName())
+        .isLocalAdminProtocolChannelSecure();
+  }
+
+  Integer getLocalAdminProtocolChannelPort() {
+    return domainTopology
+        .getServerConfig(domainTopology.getAdminServerName())
+        .getLocalAdminProtocolChannelPort();
+  }
+
   private String getLogHome() {
     return getDomain().getLogHome();
   }
@@ -793,14 +805,21 @@ private V1Probe createReadinessProbe(TuningParameters.PodTuning tuning) {
         .timeoutSeconds(getReadinessProbeTimeoutSeconds(tuning))
         .periodSeconds(getReadinessProbePeriodSeconds(tuning))
         .failureThreshold(FAILURE_THRESHOLD)
-        .httpGet(httpGetAction(READINESS_PATH, getDefaultPort()));
+        .httpGet(
+            httpGetAction(
+                READINESS_PATH,
+                getLocalAdminProtocolChannelPort(),
+                isLocalAdminProtocolChannelSecure()));
     return readinessProbe;
   }
 
   @SuppressWarnings("SameParameterValue")
-  private V1HTTPGetAction httpGetAction(String path, int port) {
+  private V1HTTPGetAction httpGetAction(String path, int port, boolean useHTTPS) {
     V1HTTPGetAction getAction = new V1HTTPGetAction();
     getAction.path(path).port(new IntOrString(port));
+    if (useHTTPS) {
+      getAction.scheme("HTTPS");
+    }
     return getAction;
   }
 

operator/src/main/java/oracle/kubernetes/operator/wlsconfig/WlsDynamicServerConfig.java

@@ -72,6 +72,7 @@ static WlsDynamicServerConfig create(
         macroSubstitutor.substituteMacro(serverTemplate.getListenAddress()),
         sslListenPort,
         macroSubstitutor.substituteMacro(serverTemplate.getMachineName()),
+        serverTemplate.getAdminPort(),
         networkAccessPoints);
   }
 
@@ -84,6 +85,7 @@ static WlsDynamicServerConfig create(
    * @param listenAddress listen address of the dynamic server
    * @param sslListenPort SSL listen port of the dynamic server
    * @param machineName machine name of the dynamic server
+   * @param adminPort administration port if administration port is enabled
    * @param networkAccessPoints network access points or channels configured for this dynamic server
    */
   private WlsDynamicServerConfig(
@@ -92,8 +94,16 @@ private WlsDynamicServerConfig(
       String listenAddress,
       Integer sslListenPort,
       String machineName,
+      Integer adminPort,
       List<NetworkAccessPoint> networkAccessPoints) {
-    super(name, listenAddress, machineName, listenPort, sslListenPort, null, networkAccessPoints);
+    super(
+        name,
+        listenAddress,
+        machineName,
+        listenPort,
+        sslListenPort,
+        adminPort,
+        networkAccessPoints);
   }
 
   /**

operator/src/main/java/oracle/kubernetes/operator/wlsconfig/WlsServerConfig.java

@@ -203,6 +203,31 @@ public Integer getLocalAdminProtocolChannelPort() {
     return adminProtocolPort;
   }
 
+  public boolean isLocalAdminProtocolChannelSecure() {
+    boolean adminProtocolPortSecure = false;
+    boolean adminProtocolPortFound = false;
+    if (networkAccessPoints != null) {
+      for (NetworkAccessPoint nap : networkAccessPoints) {
+        if (nap.isAdminProtocol()) {
+          adminProtocolPortFound = true;
+          adminProtocolPortSecure = false;
+          break;
+        }
+      }
+    }
+    if (!adminProtocolPortFound) {
+      if (adminPort != null) {
+        adminProtocolPortSecure = true;
+      } else if (sslListenPort != null) {
+        adminProtocolPortSecure = true;
+      } else if (listenPort != null) {
+        adminProtocolPortSecure = false;
+      }
+    }
+
+    return adminProtocolPortSecure;
+  }
+
   /**
    * Creates a WLSServerConfig object using an "servers" or "serverTemplates" item parsed from JSON
    * result from WLS REST call.

operator/src/main/resources/scripts/introspectDomain.py

@@ -583,6 +583,9 @@ def addServer(self, server):
     self.writeln("  listenAddress: " + self.quote(self.env.toDNS1123Legal(self.env.getDomainUID() + "-" + server.getName())))
     if server.isAdministrationPortEnabled():
       self.writeln("  adminPort: " + str(server.getAdministrationPort()))
+    else:
+      if self.env.getDomain().isAdministrationPortEnabled():
+        self.writeln("  adminPort: " + str(self.env.getDomain().getAdministrationPort()))
     self.addSSL(server)
     self.addNetworkAccessPoints(server)