chart: update default chart values

Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
SeleniumHQ · Jun 21, 2024 · 2f0f249 · 2f0f249
1 parent 33a0b67
commit 2f0f249
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 28 deletions.
diff --git a/Hub/start-selenium-grid-hub.sh b/Hub/start-selenium-grid-hub.sh
@@ -61,6 +61,16 @@ if [ ! -z "$SE_DISABLE_UI" ]; then
   SE_OPTS="$SE_OPTS --disable-ui ${SE_DISABLE_UI}"
 fi
 
+if [ ! -z "$ROUTER_USERNAME" ]; then
+  echo "Appending Selenium options: --username ${ROUTER_USERNAME}"
+  SE_OPTS="$SE_OPTS --username ${ROUTER_USERNAME}"
+fi
+
+if [ ! -z "$ROUTER_PASSWORD" ]; then
+  echo "Appending Selenium options: --password ${ROUTER_PASSWORD}"
+  SE_OPTS="$SE_OPTS --password ${ROUTER_PASSWORD}"
+fi
+
 if [ ! -z "$SE_REJECT_UNSUPPORTED_CAPS" ]; then
   echo "Appending Selenium options: --reject-unsupported-caps ${SE_REJECT_UNSUPPORTED_CAPS}"
   SE_OPTS="$SE_OPTS --reject-unsupported-caps ${SE_REJECT_UNSUPPORTED_CAPS}"

diff --git a/Makefile b/Makefile
@@ -17,9 +17,9 @@ BUILD_ARGS := $(BUILD_ARGS)
 MAJOR := $(word 1,$(subst ., ,$(TAG_VERSION)))
 MINOR := $(word 2,$(subst ., ,$(TAG_VERSION)))
 MAJOR_MINOR_PATCH := $(word 1,$(subst -, ,$(TAG_VERSION)))
-FFMPEG_TAG_VERSION := $(or $(FFMPEG_TAG_VERSION),$(FFMPEG_TAG_VERSION),ffmpeg-7.0.1)
+FFMPEG_TAG_VERSION := $(or $(FFMPEG_TAG_VERSION),$(FFMPEG_TAG_VERSION),ffmpeg-6.1.1)
 FFMPEG_BASED_NAME := $(or $(FFMPEG_BASED_NAME),$(FFMPEG_BASED_NAME),linuxserver)
-FFMPEG_BASED_TAG := $(or $(FFMPEG_BASED_TAG),$(FFMPEG_BASED_TAG),version-7.0.1-cli)
+FFMPEG_BASED_TAG := $(or $(FFMPEG_BASED_TAG),$(FFMPEG_BASED_TAG),version-6.1.1-cli)
 PLATFORMS := $(or $(PLATFORMS),$(shell echo $$PLATFORMS),linux/amd64)
 
 all: hub \

diff --git a/Router/start-selenium-grid-router.sh b/Router/start-selenium-grid-router.sh
@@ -93,6 +93,16 @@ if [ ! -z "$SE_DISABLE_UI" ]; then
   SE_OPTS="$SE_OPTS --disable-ui ${SE_DISABLE_UI}"
 fi
 
+if [ ! -z "$ROUTER_USERNAME" ]; then
+  echo "Appending Selenium options: --username ${ROUTER_USERNAME}"
+  SE_OPTS="$SE_OPTS --username ${ROUTER_USERNAME}"
+fi
+
+if [ ! -z "$ROUTER_PASSWORD" ]; then
+  echo "Appending Selenium options: --password ${ROUTER_PASSWORD}"
+  SE_OPTS="$SE_OPTS --password ${ROUTER_PASSWORD}"
+fi
+
 EXTRA_LIBS=""
 
 if [ "$SE_ENABLE_TRACING" = "true" ]; then

diff --git a/Standalone/start-selenium-standalone.sh b/Standalone/start-selenium-standalone.sh
@@ -21,6 +21,21 @@ if [ ! -z "$SE_OPTS" ]; then
   echo "Appending Selenium options: ${SE_OPTS}"
 fi
 
+if [ ! -z "$SE_DISABLE_UI" ]; then
+  echo "Appending Selenium options: --disable-ui ${SE_DISABLE_UI}"
+  SE_OPTS="$SE_OPTS --disable-ui ${SE_DISABLE_UI}"
+fi
+
+if [ ! -z "$ROUTER_USERNAME" ]; then
+  echo "Appending Selenium options: --username ${ROUTER_USERNAME}"
+  SE_OPTS="$SE_OPTS --username ${ROUTER_USERNAME}"
+fi
+
+if [ ! -z "$ROUTER_PASSWORD" ]; then
+  echo "Appending Selenium options: --password ${ROUTER_PASSWORD}"
+  SE_OPTS="$SE_OPTS --password ${ROUTER_PASSWORD}"
+fi
+
 if [ ! -z "$SE_NODE_ENABLE_MANAGED_DOWNLOADS" ]; then
   echo "Appending Selenium options: --enable-managed-downloads ${SE_NODE_ENABLE_MANAGED_DOWNLOADS}"
   SE_OPTS="$SE_OPTS --enable-managed-downloads ${SE_NODE_ENABLE_MANAGED_DOWNLOADS}"

diff --git a/charts/selenium-grid/configs/distributor/distributorProbe.sh b/charts/selenium-grid/configs/distributor/distributorProbe.sh
@@ -9,8 +9,20 @@ if [ -n "${ROUTER_USERNAME}" ] && [ -n "${ROUTER_PASSWORD}" ]; then
   BASIC_AUTH="${ROUTER_USERNAME}:${ROUTER_PASSWORD}@"
 fi
 
+if [[ ${SE_SUB_PATH} == */ ]]; then
+  GRAPHQL_ENDPOINT="${SE_SUB_PATH}graphql"
+else
+  GRAPHQL_ENDPOINT="${SE_SUB_PATH}/graphql"
+fi
+
+if [[ ${GRAPHQL_ENDPOINT} == /* ]]; then
+  GRAPHQL_ENDPOINT="${GRAPHQL_ENDPOINT}"
+else
+  GRAPHQL_ENDPOINT="/${GRAPHQL_ENDPOINT}"
+fi
+
 if [ -z "${SE_GRID_GRAPHQL_URL}" ] && [ -n "${SE_HUB_HOST:-${SE_ROUTER_HOST}}" ] && [ -n "${SE_HUB_PORT:-${SE_ROUTER_PORT}}" ]; then
-  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"
+  SE_GRID_GRAPHQL_URL="${SE_SERVER_PROTOCOL}://${BASIC_AUTH}${SE_HUB_HOST:-${SE_ROUTER_HOST}}:${SE_HUB_PORT:-${SE_ROUTER_PORT}}${GRAPHQL_ENDPOINT}"
 elif [ -z "${SE_GRID_GRAPHQL_URL}" ]; then
   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."
   exit 0

diff --git a/charts/selenium-grid/configs/router/routerProbe.sh b/charts/selenium-grid/configs/router/routerProbe.sh
@@ -9,8 +9,20 @@ if [ -n "${ROUTER_USERNAME}" ] && [ -n "${ROUTER_PASSWORD}" ]; then
   BASIC_AUTH="${ROUTER_USERNAME}:${ROUTER_PASSWORD}@"
 fi
 
+if [[ ${SE_SUB_PATH} == */ ]]; then
+  GRAPHQL_ENDPOINT="${SE_SUB_PATH}graphql"
+else
+  GRAPHQL_ENDPOINT="${SE_SUB_PATH}/graphql"
+fi
+
+if [[ ${GRAPHQL_ENDPOINT} == /* ]]; then
+  GRAPHQL_ENDPOINT="${GRAPHQL_ENDPOINT}"
+else
+  GRAPHQL_ENDPOINT="/${GRAPHQL_ENDPOINT}"
+fi
+
 if [ -z "${SE_GRID_GRAPHQL_URL}" ] && [ -n "${SE_HUB_HOST:-${SE_ROUTER_HOST}}" ] && [ -n "${SE_HUB_PORT:-${SE_ROUTER_PORT}}" ]; then
-  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"
+  SE_GRID_GRAPHQL_URL="${SE_SERVER_PROTOCOL}://${BASIC_AUTH}${SE_HUB_HOST:-${SE_ROUTER_HOST}}:${SE_HUB_PORT:-${SE_ROUTER_PORT}}${GRAPHQL_ENDPOINT}"
 elif [ -z "${SE_GRID_GRAPHQL_URL}" ]; then
   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."
   exit 0

diff --git a/charts/selenium-grid/values.yaml b/charts/selenium-grid/values.yaml
@@ -1215,8 +1215,6 @@ videoRecorder:
   # SecurityContext for recorder container
   securityContext:
   extraEnvironmentVariables:
-  # - name: SE_VIDEO_FOLDER
-  #   value: /videos
   # Custom environment variables by sourcing entire configMap, Secret, etc. for video recorder.
   extraEnvFrom:
   # - configMapRef:
@@ -1316,25 +1314,3 @@ jaeger:
     enabled: false
   query:
     enabled: false
-
-prometheus-stack:
-  cleanPrometheusOperatorObjectNames: true
-  defaultRules:
-    create: true
-    annotations:
-      "helm.sh/hook": post-install,post-upgrade,post-rollback
-  alertmanager:
-    enabled: true
-    annotations:
-      "helm.sh/hook": post-install,post-upgrade,post-rollback
-  grafana:
-    enabled: true
-    adminPassword: admin
-    forceDeployDatasources: true
-    forceDeployDashboards: true
-    annotations:
-      "helm.sh/hook": post-install,post-upgrade,post-rollback
-  prometheus:
-    enabled: true
-    annotations:
-      "helm.sh/hook": post-install,post-upgrade,post-rollback
diff --git a/tests/charts/ci/base-tls-values.yaml b/tests/charts/ci/base-tls-values.yaml
@@ -9,19 +9,36 @@ monitoring:
   enabled: false
 
 prometheus-stack:
+  cleanPrometheusOperatorObjectNames: true
+  defaultRules:
+    create: true
+    annotations:
+      "helm.sh/hook": post-install,post-upgrade,post-rollback
   alertmanager:
+    enabled: true
+    annotations:
+      "helm.sh/hook": post-install,post-upgrade,post-rollback
     ingress:
       enabled: true
       ingressClassName: nginx
       hosts:
         - alertmanager.selenium-grid.prod
   grafana:
+    enabled: true
+    adminPassword: admin
+    forceDeployDatasources: true
+    forceDeployDashboards: true
+    annotations:
+      "helm.sh/hook": post-install,post-upgrade,post-rollback
     ingress:
       enabled: true
       ingressClassName: nginx
       hosts:
         - grafana.selenium-grid.prod
   prometheus:
+    enabled: true
+    annotations:
+      "helm.sh/hook": post-install,post-upgrade,post-rollback
     ingress:
       enabled: true
       ingressClassName: nginx