Merge branch 'trap' into 'main'

Cleanup traps and container exit messages

See merge request weblogic-cloud/weblogic-kubernetes-operator!4933

Author: rjeberhard

deployment/scripts/operator.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 echo "Launching Oracle WebLogic Server Kubernetes Operator..."
@@ -9,10 +9,27 @@ relay_SIGTERM() {
   pid=`grep java /proc/[0-9]*/comm | awk -F / '{ print $3; }'`
   echo "Sending SIGTERM to java process " $pid
   kill -SIGTERM $pid
+  exit 0
 }
 
 trap relay_SIGTERM SIGTERM
 
+# Relays SIGKILL to all java processes
+relay_SIGKILL() {
+  pid=`grep java /proc/[0-9]*/comm | awk -F / '{ print $3; }'`
+  echo "Sending SIGKILL to java process " $pid
+  kill -SIGKILL $pid
+  exit 0
+}
+
+trap relay_SIGKILL SIGKILL
+
+exitMessage() {
+  echo "Exiting container for the Oracle WebLogic Server Kubernetes Operator..."
+}
+
+trap exitMessage EXIT
+
 DEPLOYMENT_DIR="/deployment"
 ${DEPLOYMENT_DIR}/initialize-external-operator-identity.sh
 

deployment/scripts/webhook.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
-# Copyright (c) 2022, Oracle and/or its affiliates.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-echo "Launching the Domain Custom Resource Conversion Webhook for Oracle WebLogic Server Kubernetes Operator..."
+echo "Launching the Schema Conversion Webhook for Oracle WebLogic Server Kubernetes Operator..."
 
 # Relays SIGTERM to all java processes
 relay_SIGTERM() {
@@ -13,6 +13,22 @@ relay_SIGTERM() {
 
 trap relay_SIGTERM SIGTERM
 
+# Relays SIGKILL to all java processes
+relay_SIGKILL() {
+  pid=`grep java /proc/[0-9]*/comm | awk -F / '{ print $3; }'`
+  echo "Sending SIGKILL to java process " $pid
+  kill -SIGKILL $pid
+  exit 0
+}
+
+trap relay_SIGKILL SIGKILL
+
+exitMessage() {
+  echo "Exiting container for the Schema Conversion Webhook for Oracle WebLogic Server Kubernetes Operator..."
+}
+
+trap exitMessage EXIT
+
 if [[ ! -z "$REMOTE_DEBUG_PORT" ]]; then
   DEBUG="-agentlib:jdwp=transport=dt_socket,server=y,suspend=$DEBUG_SUSPEND,address=*:$REMOTE_DEBUG_PORT"
   echo "DEBUG=$DEBUG"

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

@@ -1,12 +1,25 @@
 #!/bin/bash
-# Copyright (c) 2017, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 #
 # startServer.sh
 # This is the script WebLogic Operator WLS Pods use to start their WL Server.
 #
 
+cleanup() {
+  trace "Suppressing signal to allow container to exit cleanly."
+  exit 0
+}
+
+trap cleanup SIGTERM SIGKILL
+
+exitMessage() {
+  trace "Exiting container for WebLogic Server '${SERVER_NAME}'."
+}
+
+trap exitMessage EXIT
+
 if [ -z ${SCRIPTPATH+x} ]; then
   SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
 fi
@@ -312,7 +325,7 @@ else
 fi
 
 #
-# Wait forever. Kubernetes will monitor this pod via liveness and readyness probes.
+# Wait forever. Kubernetes will monitor this pod via liveness and readiness probes.
 #
 
 waitForShutdownMarker