Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

K8s: Update default component ConfigMap and resources limits #2596

Merged
merged 2 commits into from
Jan 18, 2025
Merged

K8s: Update default component ConfigMap and resources limits #2596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6af8daf
K8s: Update default component ConfigMap and resources limits
VietND96 Jan 18, 2025
e31d575
Docker: Logs value SE_JAVA_OPTS while starting container
VietND96 Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Distributor/start-selenium-grid-distributor.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
fi
if [ -n "$SE_OTEL_JVM_ARGS" ]; then
echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
fi
else
Expand All @@ -187,6 +186,10 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
fi

if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
fi

function handle_heap_dump() {
/opt/bin/handle_heap_dump.sh $SELENIUM_SERVER_PID /opt/selenium/logs
}
Expand Down
5 changes: 4 additions & 1 deletion EventBus/start-selenium-grid-eventbus.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
fi
if [ -n "$SE_OTEL_JVM_ARGS" ]; then
echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
fi
else
Expand All @@ -117,6 +116,10 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
fi

if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
fi

function handle_heap_dump() {
/opt/bin/handle_heap_dump.sh $SELENIUM_SERVER_PID /opt/selenium/logs
}
Expand Down
5 changes: 4 additions & 1 deletion Hub/start-selenium-grid-hub.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
fi
if [ -n "$SE_OTEL_JVM_ARGS" ]; then
echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
fi
else
Expand All @@ -167,6 +166,10 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
fi

if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
fi

function handle_heap_dump() {
/opt/bin/handle_heap_dump.sh $SELENIUM_SERVER_PID /opt/selenium/logs
}
Expand Down
5 changes: 4 additions & 1 deletion NodeBase/start-selenium-node.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
fi
if [ -n "$SE_OTEL_JVM_ARGS" ]; then
echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
fi
else
Expand Down Expand Up @@ -182,6 +181,10 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
fi

if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
fi

function handle_heap_dump() {
/opt/bin/handle_heap_dump.sh $SELENIUM_SERVER_PID /opt/selenium/logs
}
Expand Down
5 changes: 4 additions & 1 deletion NodeDocker/start-selenium-grid-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
fi
if [ -n "$SE_OTEL_JVM_ARGS" ]; then
echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
fi
else
Expand All @@ -134,6 +133,10 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
fi

if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
fi

function handle_heap_dump() {
/opt/bin/handle_heap_dump.sh $SELENIUM_SERVER_PID /opt/selenium/logs
}
Expand Down
5 changes: 4 additions & 1 deletion Router/start-selenium-grid-router.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
fi
if [ -n "$SE_OTEL_JVM_ARGS" ]; then
echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
fi
else
Expand All @@ -168,6 +167,10 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
fi

if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
fi

function handle_heap_dump() {
/opt/bin/handle_heap_dump.sh $SELENIUM_SERVER_PID /opt/selenium/logs
}
Expand Down
5 changes: 4 additions & 1 deletion SessionQueue/start-selenium-grid-session-queue.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
fi
if [ -n "$SE_OTEL_JVM_ARGS" ]; then
echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
fi
else
Expand All @@ -121,6 +120,10 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
fi

if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
fi

function handle_heap_dump() {
/opt/bin/handle_heap_dump.sh $SELENIUM_SERVER_PID /opt/selenium/logs
}
Expand Down
5 changes: 4 additions & 1 deletion Sessions/start-selenium-grid-sessions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
fi
if [ -n "$SE_OTEL_JVM_ARGS" ]; then
echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
fi
else
Expand Down Expand Up @@ -156,6 +155,10 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
fi

if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
fi

function handle_heap_dump() {
/opt/bin/handle_heap_dump.sh $SELENIUM_SERVER_PID /opt/selenium/logs
}
Expand Down
5 changes: 4 additions & 1 deletion Standalone/start-selenium-standalone.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
fi
if [ -n "$SE_OTEL_JVM_ARGS" ]; then
echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
fi
else
Expand All @@ -170,6 +169,10 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
fi

if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
fi

function handle_heap_dump() {
/opt/bin/handle_heap_dump.sh $SELENIUM_SERVER_PID /opt/selenium/logs
}
Expand Down
5 changes: 4 additions & 1 deletion StandaloneDocker/start-selenium-grid-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
fi
if [ -n "$SE_OTEL_JVM_ARGS" ]; then
echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
fi
else
Expand All @@ -135,6 +134,10 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
fi

if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
fi

function handle_heap_dump() {
/opt/bin/handle_heap_dump.sh $SELENIUM_SERVER_PID /opt/selenium/logs
}
Expand Down
Loading
Loading