Skip to content

Commit 2f0f249

Browse files
VietND96VietND96
committed
chart: update default chart values
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 33a0b67 commit 2f0f249

File tree

8 files changed

+80
-28
lines changed

8 files changed

+80
-28
lines changed

Diff for: ‎Hub/start-selenium-grid-hub.sh

+10
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,16 @@ if [ ! -z "$SE_DISABLE_UI" ]; then
6161
SE_OPTS="$SE_OPTS --disable-ui ${SE_DISABLE_UI}"
6262
fi
6363

64+
if [ ! -z "$ROUTER_USERNAME" ]; then
65+
echo "Appending Selenium options: --username ${ROUTER_USERNAME}"
66+
SE_OPTS="$SE_OPTS --username ${ROUTER_USERNAME}"
67+
fi
68+
69+
if [ ! -z "$ROUTER_PASSWORD" ]; then
70+
echo "Appending Selenium options: --password ${ROUTER_PASSWORD}"
71+
SE_OPTS="$SE_OPTS --password ${ROUTER_PASSWORD}"
72+
fi
73+
6474
if [ ! -z "$SE_REJECT_UNSUPPORTED_CAPS" ]; then
6575
echo "Appending Selenium options: --reject-unsupported-caps ${SE_REJECT_UNSUPPORTED_CAPS}"
6676
SE_OPTS="$SE_OPTS --reject-unsupported-caps ${SE_REJECT_UNSUPPORTED_CAPS}"

Diff for: ‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ BUILD_ARGS := $(BUILD_ARGS)
1717
MAJOR := $(word 1,$(subst ., ,$(TAG_VERSION)))
1818
MINOR := $(word 2,$(subst ., ,$(TAG_VERSION)))
1919
MAJOR_MINOR_PATCH := $(word 1,$(subst -, ,$(TAG_VERSION)))
20-
FFMPEG_TAG_VERSION := $(or $(FFMPEG_TAG_VERSION),$(FFMPEG_TAG_VERSION),ffmpeg-7.0.1)
20+
FFMPEG_TAG_VERSION := $(or $(FFMPEG_TAG_VERSION),$(FFMPEG_TAG_VERSION),ffmpeg-6.1.1)
2121
FFMPEG_BASED_NAME := $(or $(FFMPEG_BASED_NAME),$(FFMPEG_BASED_NAME),linuxserver)
22-
FFMPEG_BASED_TAG := $(or $(FFMPEG_BASED_TAG),$(FFMPEG_BASED_TAG),version-7.0.1-cli)
22+
FFMPEG_BASED_TAG := $(or $(FFMPEG_BASED_TAG),$(FFMPEG_BASED_TAG),version-6.1.1-cli)
2323
PLATFORMS := $(or $(PLATFORMS),$(shell echo $$PLATFORMS),linux/amd64)
2424

2525
all: hub \

Diff for: ‎Router/start-selenium-grid-router.sh

+10
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,16 @@ if [ ! -z "$SE_DISABLE_UI" ]; then
9393
SE_OPTS="$SE_OPTS --disable-ui ${SE_DISABLE_UI}"
9494
fi
9595

96+
if [ ! -z "$ROUTER_USERNAME" ]; then
97+
echo "Appending Selenium options: --username ${ROUTER_USERNAME}"
98+
SE_OPTS="$SE_OPTS --username ${ROUTER_USERNAME}"
99+
fi
100+
101+
if [ ! -z "$ROUTER_PASSWORD" ]; then
102+
echo "Appending Selenium options: --password ${ROUTER_PASSWORD}"
103+
SE_OPTS="$SE_OPTS --password ${ROUTER_PASSWORD}"
104+
fi
105+
96106
EXTRA_LIBS=""
97107

98108
if [ "$SE_ENABLE_TRACING" = "true" ]; then

Diff for: ‎Standalone/start-selenium-standalone.sh

+15
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,21 @@ if [ ! -z "$SE_OPTS" ]; then
2121
echo "Appending Selenium options: ${SE_OPTS}"
2222
fi
2323

24+
if [ ! -z "$SE_DISABLE_UI" ]; then
25+
echo "Appending Selenium options: --disable-ui ${SE_DISABLE_UI}"
26+
SE_OPTS="$SE_OPTS --disable-ui ${SE_DISABLE_UI}"
27+
fi
28+
29+
if [ ! -z "$ROUTER_USERNAME" ]; then
30+
echo "Appending Selenium options: --username ${ROUTER_USERNAME}"
31+
SE_OPTS="$SE_OPTS --username ${ROUTER_USERNAME}"
32+
fi
33+
34+
if [ ! -z "$ROUTER_PASSWORD" ]; then
35+
echo "Appending Selenium options: --password ${ROUTER_PASSWORD}"
36+
SE_OPTS="$SE_OPTS --password ${ROUTER_PASSWORD}"
37+
fi
38+
2439
if [ ! -z "$SE_NODE_ENABLE_MANAGED_DOWNLOADS" ]; then
2540
echo "Appending Selenium options: --enable-managed-downloads ${SE_NODE_ENABLE_MANAGED_DOWNLOADS}"
2641
SE_OPTS="$SE_OPTS --enable-managed-downloads ${SE_NODE_ENABLE_MANAGED_DOWNLOADS}"

Diff for: ‎charts/selenium-grid/configs/distributor/distributorProbe.sh

+13-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,20 @@ if [ -n "${ROUTER_USERNAME}" ] && [ -n "${ROUTER_PASSWORD}" ]; then
99
BASIC_AUTH="${ROUTER_USERNAME}:${ROUTER_PASSWORD}@"
1010
fi
1111

12+
if [[ ${SE_SUB_PATH} == */ ]]; then
13+
GRAPHQL_ENDPOINT="${SE_SUB_PATH}graphql"
14+
else
15+
GRAPHQL_ENDPOINT="${SE_SUB_PATH}/graphql"
16+
fi
17+
18+
if [[ ${GRAPHQL_ENDPOINT} == /* ]]; then
19+
GRAPHQL_ENDPOINT="${GRAPHQL_ENDPOINT}"
20+
else
21+
GRAPHQL_ENDPOINT="/${GRAPHQL_ENDPOINT}"
22+
fi
23+
1224
if [ -z "${SE_GRID_GRAPHQL_URL}" ] && [ -n "${SE_HUB_HOST:-${SE_ROUTER_HOST}}" ] && [ -n "${SE_HUB_PORT:-${SE_ROUTER_PORT}}" ]; then
13-
SE_GRID_GRAPHQL_URL="${SE_SERVER_PROTOCOL}://${BASIC_AUTH}${SE_HUB_HOST:-${SE_ROUTER_HOST}}:${SE_HUB_PORT:-${SE_ROUTER_PORT}}${SE_SUB_PATH}/graphql"
25+
SE_GRID_GRAPHQL_URL="${SE_SERVER_PROTOCOL}://${BASIC_AUTH}${SE_HUB_HOST:-${SE_ROUTER_HOST}}:${SE_HUB_PORT:-${SE_ROUTER_PORT}}${GRAPHQL_ENDPOINT}"
1426
elif [ -z "${SE_GRID_GRAPHQL_URL}" ]; then
1527
echo "$(date ${ts_format}) DEBUG [${probe_name}] - Could not construct GraphQL endpoint, it can be set directly via SE_GRID_GRAPHQL_URL. Bypass the probe checks for now."
1628
exit 0

Diff for: ‎charts/selenium-grid/configs/router/routerProbe.sh

+13-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,20 @@ if [ -n "${ROUTER_USERNAME}" ] && [ -n "${ROUTER_PASSWORD}" ]; then
99
BASIC_AUTH="${ROUTER_USERNAME}:${ROUTER_PASSWORD}@"
1010
fi
1111

12+
if [[ ${SE_SUB_PATH} == */ ]]; then
13+
GRAPHQL_ENDPOINT="${SE_SUB_PATH}graphql"
14+
else
15+
GRAPHQL_ENDPOINT="${SE_SUB_PATH}/graphql"
16+
fi
17+
18+
if [[ ${GRAPHQL_ENDPOINT} == /* ]]; then
19+
GRAPHQL_ENDPOINT="${GRAPHQL_ENDPOINT}"
20+
else
21+
GRAPHQL_ENDPOINT="/${GRAPHQL_ENDPOINT}"
22+
fi
23+
1224
if [ -z "${SE_GRID_GRAPHQL_URL}" ] && [ -n "${SE_HUB_HOST:-${SE_ROUTER_HOST}}" ] && [ -n "${SE_HUB_PORT:-${SE_ROUTER_PORT}}" ]; then
13-
SE_GRID_GRAPHQL_URL="${SE_SERVER_PROTOCOL}://${BASIC_AUTH}${SE_HUB_HOST:-${SE_ROUTER_HOST}}:${SE_HUB_PORT:-${SE_ROUTER_PORT}}${SE_SUB_PATH}/graphql"
25+
SE_GRID_GRAPHQL_URL="${SE_SERVER_PROTOCOL}://${BASIC_AUTH}${SE_HUB_HOST:-${SE_ROUTER_HOST}}:${SE_HUB_PORT:-${SE_ROUTER_PORT}}${GRAPHQL_ENDPOINT}"
1426
elif [ -z "${SE_GRID_GRAPHQL_URL}" ]; then
1527
echo "$(date ${ts_format}) DEBUG [${probe_name}] - Could not construct GraphQL endpoint, it can be set directly via SE_GRID_GRAPHQL_URL. Bypass the probe checks for now."
1628
exit 0

Diff for: ‎charts/selenium-grid/values.yaml

-24
Original file line numberDiff line numberDiff line change
@@ -1215,8 +1215,6 @@ videoRecorder:
12151215
# SecurityContext for recorder container
12161216
securityContext:
12171217
extraEnvironmentVariables:
1218-
# - name: SE_VIDEO_FOLDER
1219-
# value: /videos
12201218
# Custom environment variables by sourcing entire configMap, Secret, etc. for video recorder.
12211219
extraEnvFrom:
12221220
# - configMapRef:
@@ -1316,25 +1314,3 @@ jaeger:
13161314
enabled: false
13171315
query:
13181316
enabled: false
1319-
1320-
prometheus-stack:
1321-
cleanPrometheusOperatorObjectNames: true
1322-
defaultRules:
1323-
create: true
1324-
annotations:
1325-
"helm.sh/hook": post-install,post-upgrade,post-rollback
1326-
alertmanager:
1327-
enabled: true
1328-
annotations:
1329-
"helm.sh/hook": post-install,post-upgrade,post-rollback
1330-
grafana:
1331-
enabled: true
1332-
adminPassword: admin
1333-
forceDeployDatasources: true
1334-
forceDeployDashboards: true
1335-
annotations:
1336-
"helm.sh/hook": post-install,post-upgrade,post-rollback
1337-
prometheus:
1338-
enabled: true
1339-
annotations:
1340-
"helm.sh/hook": post-install,post-upgrade,post-rollback

Diff for: ‎tests/charts/ci/base-tls-values.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,36 @@ monitoring:
99
enabled: false
1010

1111
prometheus-stack:
12+
cleanPrometheusOperatorObjectNames: true
13+
defaultRules:
14+
create: true
15+
annotations:
16+
"helm.sh/hook": post-install,post-upgrade,post-rollback
1217
alertmanager:
18+
enabled: true
19+
annotations:
20+
"helm.sh/hook": post-install,post-upgrade,post-rollback
1321
ingress:
1422
enabled: true
1523
ingressClassName: nginx
1624
hosts:
1725
- alertmanager.selenium-grid.prod
1826
grafana:
27+
enabled: true
28+
adminPassword: admin
29+
forceDeployDatasources: true
30+
forceDeployDashboards: true
31+
annotations:
32+
"helm.sh/hook": post-install,post-upgrade,post-rollback
1933
ingress:
2034
enabled: true
2135
ingressClassName: nginx
2236
hosts:
2337
- grafana.selenium-grid.prod
2438
prometheus:
39+
enabled: true
40+
annotations:
41+
"helm.sh/hook": post-install,post-upgrade,post-rollback
2542
ingress:
2643
enabled: true
2744
ingressClassName: nginx

0 commit comments

Comments
 (0)