Readiness probe use ready app endpoint

Author: rjeberhard

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

@@ -6,12 +6,14 @@
 
 import static oracle.kubernetes.operator.LabelConstants.forDomainUid;
 
+import io.kubernetes.client.custom.IntOrString;
 import io.kubernetes.client.models.V1ConfigMapVolumeSource;
 import io.kubernetes.client.models.V1Container;
 import io.kubernetes.client.models.V1ContainerPort;
 import io.kubernetes.client.models.V1DeleteOptions;
 import io.kubernetes.client.models.V1EnvVar;
 import io.kubernetes.client.models.V1ExecAction;
+import io.kubernetes.client.models.V1HTTPGetAction;
 import io.kubernetes.client.models.V1Handler;
 import io.kubernetes.client.models.V1Lifecycle;
 import io.kubernetes.client.models.V1ObjectMeta;
@@ -58,9 +60,10 @@ public abstract class PodStepContext implements StepContextConstants {
 
   private static final String STOP_SERVER = "/weblogic-operator/scripts/stopServer.sh";
   private static final String START_SERVER = "/weblogic-operator/scripts/startServer.sh";
-  private static final String READINESS_PROBE = "/weblogic-operator/scripts/readinessProbe.sh";
   private static final String LIVENESS_PROBE = "/weblogic-operator/scripts/livenessProbe.sh";
 
+  private static final String READINESS_PATH = "/weblogic";
+
   private final DomainPresenceInfo info;
   private final Step conflictStep;
   private V1Pod podModel;
@@ -762,10 +765,16 @@ private V1Probe createReadinessProbe(TuningParameters.PodTuning tuning) {
         .timeoutSeconds(getReadinessProbeTimeoutSeconds(tuning))
         .periodSeconds(getReadinessProbePeriodSeconds(tuning))
         .failureThreshold(FAILURE_THRESHOLD)
-        .exec(execAction(READINESS_PROBE));
+        .httpGet(httpGetAction(READINESS_PATH, getPort()));
     return readinessProbe;
   }
 
+  private V1HTTPGetAction httpGetAction(String path, int port) {
+    V1HTTPGetAction getAction = new V1HTTPGetAction();
+    getAction.path(path).port(new IntOrString(port));
+    return getAction;
+  }
+
   private int getReadinessProbePeriodSeconds(TuningParameters.PodTuning tuning) {
     return Optional.ofNullable(getServerSpec().getReadinessProbe().getPeriodSeconds())
         .orElse(tuning.readinessProbePeriodSeconds);

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

@@ -58,7 +58,6 @@ public class ConfigMapHelperTest {
   private static final String DOMAIN_UID = "domainUID1";
   static final String[] SCRIPT_NAMES = {
     "livenessProbe.sh",
-    "readinessProbe.sh",
     "readState.sh",
     "start-server.py",
     "startServer.sh",

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

@@ -34,6 +34,7 @@
 import io.kubernetes.client.models.V1ContainerPort;
 import io.kubernetes.client.models.V1EnvVar;
 import io.kubernetes.client.models.V1ExecAction;
+import io.kubernetes.client.models.V1HTTPGetAction;
 import io.kubernetes.client.models.V1Handler;
 import io.kubernetes.client.models.V1HostPathVolumeSource;
 import io.kubernetes.client.models.V1Lifecycle;
@@ -303,9 +304,9 @@ public void whenPodCreated_livenessProbeHasDefinedTuning() {
 
   @Test
   public void whenPodCreated_readinessProbeHasReadinessCommand() {
-    assertThat(
-        getCreatedPodSpecContainer().getReadinessProbe().getExec().getCommand(),
-        contains("/weblogic-operator/scripts/readinessProbe.sh"));
+    V1HTTPGetAction getAction = getCreatedPodSpecContainer().getReadinessProbe().getHttpGet();
+    assertThat(getAction.getPath(), equalTo("/weblogic"));
+    assertThat(getAction.getPort().getIntValue(), equalTo(listenPort));
   }
 
   @Test