Merge pull request #555 from oracle/develop-feature-mock-wls

Develop feature mock wls

Author: rjeberhard

kubernetes/charts/weblogic-operator/templates/_operator-dep.tpl

@@ -40,6 +40,10 @@ spec:
         - name: "REMOTE_DEBUG_PORT"
           value: {{ .internalDebugHttpPort | quote }}
         {{- end }}
+        {{- if .mockWLS }}
+        - name: "MOCK_WLS"
+          value: "true"
+        {{- end }}
         volumeMounts:
         - name: "weblogic-operator-cm-volume"
           mountPath: "/operator/config"

kubernetes/charts/weblogic-operator/templates/_validate-inputs.tpl

@@ -35,6 +35,7 @@
 {{- end -}}
 {{- $ignore := include "utils.verifyString" (list $scope "tillerNamespace") -}}
 {{- $ignore := include "utils.verifyString" (list $scope "tillerServiceAccount") -}}
+{{- $ignore := include "utils.verifyOptionalBoolean" (list $scope "mockWLS") -}}
 {{- $ignore:= include "utils.endValidation" $scope -}}
 {{- include "operator.operatorVerificationHook" (list $scope "pre-upgrade") }}
 {{- include "operator.operatorVerificationHook" (list $scope "pre-install") }}

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

@@ -650,9 +650,12 @@ private V1Container createContainer(TuningParameters tuningParameters) {
             .addVolumeMountsItem(readOnlyVolumeMount(SECRETS_VOLUME, SECRETS_MOUNT_PATH))
             .addVolumeMountsItem(readOnlyVolumeMount(SCRIPTS_VOLUME, SCRIPTS_MOUNTS_PATH))
             .addVolumeMountsItem(readOnlyVolumeMount(DEBUG_CM_VOLUME, DEBUG_CM_MOUNTS_PATH))
-            .readinessProbe(createReadinessProbe(tuningParameters.getPodTuning()))
             .livenessProbe(createLivenessProbe(tuningParameters.getPodTuning()));
 
+    if (!mockWLS()) {
+      v1Container.readinessProbe(createReadinessProbe(tuningParameters.getPodTuning()));
+    }
+
     for (V1VolumeMount additionalVolumeMount : getAdditionalVolumeMounts()) {
       v1Container.addVolumeMountsItem(additionalVolumeMount);
     }
@@ -699,6 +702,9 @@ void overrideContainerWeblogicEnvVars(List<V1EnvVar> vars) {
     addEnvVar(
         vars, "SERVICE_NAME", LegalNames.toServerServiceName(getDomainUID(), getServerName()));
     addEnvVar(vars, "AS_SERVICE_NAME", LegalNames.toServerServiceName(getDomainUID(), getAsName()));
+    if (mockWLS()) {
+      addEnvVar(vars, "MOCK_WLS", "true");
+    }
     hideAdminUserCredentials(vars);
   }
 
@@ -813,4 +819,8 @@ private int getLivenessProbePeriodSeconds(TuningParameters.PodTuning tuning) {
     return Optional.ofNullable(getServerSpec().getLivenessProbe().getPeriodSeconds())
         .orElse(tuning.livenessProbePeriodSeconds);
   }
+
+  private boolean mockWLS() {
+    return Boolean.getBoolean("mockWLS");
+  }
 }

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

@@ -12,15 +12,17 @@ DN=${DOMAIN_NAME?}
 SN=${SERVER_NAME?}
 DH=${DOMAIN_HOME?}
 
-STATEFILE=/${DH}/servers/${SN}/data/nodemanager/${SN}.state
+STATEFILE=${DH}/servers/${SN}/data/nodemanager/${SN}.state
 
 # if the livenessProbeSuccessOverride file is available, treat failures as success
 #
 RETVAL=$(test -f /weblogic-operator/debug/livenessProbeSuccessOverride ; echo $?)
 
-if [ `jps -l | grep -c " weblogic.NodeManager"` -eq 0 ]; then
-  echo "Error: WebLogic NodeManager process not found."
-  exit $RETVAL
+if [ "${MOCK_WLS}" != 'true' ]; then
+  if [ `jps -l | grep -c " weblogic.NodeManager"` -eq 0 ]; then
+    echo "Error: WebLogic NodeManager process not found."
+    exit $RETVAL
+  fi
 fi
 if [ -f ${STATEFILE} ] && [ `grep -c "FAILED_NOT_RESTARTABLE" ${STATEFILE}` -eq 1 ]; then
   echo "Error: WebLogic Server state is FAILED_NOT_RESTARTABLE."

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

@@ -60,6 +60,40 @@ function copyIfChanged() {
 }
 
 #
+# Define function to start weblogic
+#
+
+function startWLS() {
+  #
+  # Start NM
+  #
+
+  trace "Start node manager"
+  # call script to start node manager in same shell
+  # $SERVER_OUT_FILE will be set in startNodeManager.sh
+  . ${SCRIPTPATH}/startNodeManager.sh || exitOrLoop
+
+  #
+  # Start WL Server
+  #
+
+  # TBD We should probably || exit 1 if start-server.py itself fails, and dump NM log to stdout
+
+  trace "Start WebLogic Server via the nodemanager"
+  ${SCRIPTPATH}/wlst.sh $SCRIPTPATH/start-server.py
+}
+
+function mockWLS() {
+
+  trace "Mocking WebLogic Server"
+
+  STATEFILE_DIR=${DOMAIN_HOME}/servers/${SERVER_NAME}/data/nodemanager
+  STATEFILE=${STATEFILE_DIR}/${SERVER_NAME}.state
+
+  createFolder $STATEFILE_DIR
+  echo "RUNNING:Y:N" > $STATEFILE
+}
+
 # Define helper fn to copy sit cfg xml files from one dir to another
 #   $src_dir files are assumed to start with $fil_prefix and end with .xml
 #   Copied $tgt_dir files are stripped of their $fil_prefix
@@ -144,29 +178,17 @@ copySitCfg /weblogic-operator/introspector ${DOMAIN_HOME}/optconfig/jms   'Sit-C
 copySitCfg /weblogic-operator/introspector ${DOMAIN_HOME}/optconfig/jdbc  'Sit-Cfg-JDBC--'
 copySitCfg /weblogic-operator/introspector ${DOMAIN_HOME}/optconfig/wldf  'Sit-Cfg-WLDF--'
 
-#
-# Start NM
-#
-
-trace "Start node manager"
-# call script to start node manager in same shell 
-# $SERVER_OUT_FILE will be set in startNodeManager.sh
-. ${SCRIPTPATH}/startNodeManager.sh || exitOrLoop
-
-#
-# Start WL Server
-#
-
-# TBD We should probably || exitOrLoop if start-server.py itself fails, and dump NM log to stdout
-
-trace "Start WebLogic Server via the nodemanager"
-${SCRIPTPATH}/wlst.sh $SCRIPTPATH/start-server.py
+if [ "${MOCK_WLS}" == 'true' ]; then
+  mockWLS
+else
+  startWLS
+fi
 
 #
 # Wait forever.   Kubernetes will monitor this pod via liveness and readyness probes.
 #
 
-if [ "${SERVER_OUT_IN_POD_LOG}" == 'true' ] ; then
+if [ "${MOCK_WLS}" != 'true' ] && [ "${SERVER_OUT_IN_POD_LOG}" == 'true' ] ; then
   trace "Showing the server out file from ${SERVER_OUT_FILE}"
   tail -F -n +0 ${SERVER_OUT_FILE} || exitOrLoop
 else

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

@@ -17,6 +17,10 @@ trace "Stop server ${SERVER_NAME}"
 
 checkEnv SERVER_NAME || exit 1
 
+if [ "${MOCK_WLS}" == 'true' ]; then
+  exit 0
+fi
+
 [ ! -f "${SCRIPTPATH}/wlst.sh" ]             && trace "Error: missing file '${SCRIPTPATH}/wlst.sh'."             && exit 1
 
 ${SCRIPTDIR}/wlst.sh /weblogic-operator/scripts/stop-server.py 

src/scripts/operator.sh

@@ -54,13 +54,17 @@ if [[ ! -z "$JAVA_LOGGING_LEVEL" ]]; then
   fi
 fi
 
+if [ "${MOCK_WLS}" == 'true' ]; then
+  MOCKING_WLS="-DmockWLS=true"
+fi
+
 LOGGING="-Djava.util.logging.config.file=${LOGGING_CONFIG}"
 mkdir -m 777 -p /logs
 cp /operator/logstash.conf /logs/logstash.conf
 # assumption is that we have mounted a volume on /logs which is also visible to
 # the logstash container/pod.
 
 # Start operator
-java $DEBUG $LOGGING -jar /operator/weblogic-kubernetes-operator.jar &
+java $MOCKING_WLS $DEBUG $LOGGING -jar /operator/weblogic-kubernetes-operator.jar &
 PID=$!
 wait $PID