Code review

Author: rjeberhard

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

@@ -67,11 +67,15 @@ public NextAction apply(Packet packet) {
           "# Kubernetes periodically calls this liveness probe script to determine whether\n" + 
           "# the pod should be restarted. The script checks a WebLogic Server state file which\n" + 
           "# is updated by the node manager.\n" + 
-          "STATEFILE=/shared/domain/$1/servers/$2/data/nodemanager/$2.state\n" + 
+          "DOMAIN_NAME=$1\n" +
+          "SERVER_NAME=$2\n" +
+          "STATEFILE=/shared/domain/${DOMAIN_NAME}/servers/${SERVER_NAME}/data/nodemanager/${SERVER_NAME}.state\n" + 
           "if [ `jps -l | grep -c \" weblogic.NodeManager\"` -eq 0 ]; then\n" + 
+          "  echo \"Error: WebLogic NodeManager process not found.\"\n" +
           "  exit 1\n" + 
           "fi\n" + 
           "if [ -f ${STATEFILE} ] && [ `grep -c \"FAILED_NOT_RESTARTABLE\" ${STATEFILE}` -eq 1 ]; then\n" + 
+          "  echo \"Error: WebLogic Server FAILED_NOT_RESTARTABLE.\"\n" +
           "  exit 1\n" + 
           "fi\n" + 
           "exit 0");
@@ -83,9 +87,12 @@ public NextAction apply(Packet packet) {
           "# the pod should be included in load balancing. The script checks a WebLogic Server state\n" + 
           "# file which is updated by the node manager.\n" + 
           "\n" + 
-          "STATEFILE=/shared/domain/$1/servers/$2/data/nodemanager/$2.state\n" + 
+          "DOMAIN_NAME=$1\n" +
+          "SERVER_NAME=$2\n" +
+          "STATEFILE=/shared/domain/${DOMAIN_NAME}/servers/${SERVER_NAME}/data/nodemanager/${SERVER_NAME}.state\n" + 
           "\n" + 
           "if [ `jps -l | grep -c \" weblogic.NodeManager\"` -eq 0 ]; then\n" + 
+          "  echo \"Error: WebLogic NodeManager process not found.\"\n" +
           "  exit 1\n" + 
           "fi\n" + 
           "\n" + 

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

@@ -166,9 +166,9 @@ public NextAction apply(Packet packet) {
       readinessAction.addCommandItem(weblogicDomainName);
       readinessAction.addCommandItem(spec.getAsName());
       readinessProbe.exec(readinessAction);
-      readinessProbe.setInitialDelaySeconds(2);
+      readinessProbe.setInitialDelaySeconds(5);
       readinessProbe.setTimeoutSeconds(5);
-      readinessProbe.setPeriodSeconds(10);
+      readinessProbe.setPeriodSeconds(5);
       readinessProbe.setFailureThreshold(1);
       container.readinessProbe(readinessProbe);
 
@@ -180,7 +180,7 @@ public NextAction apply(Packet packet) {
       livenessProbe.exec(livenessAction);
       livenessProbe.setInitialDelaySeconds(10);
       livenessProbe.setTimeoutSeconds(5);
-      livenessProbe.setPeriodSeconds(10);
+      livenessProbe.setPeriodSeconds(5);
       livenessProbe.setFailureThreshold(1);
       container.livenessProbe(livenessProbe);