refactor(helm/docs): Rename package.query_engine to webui.query_engine and update Presto configurations

Author: junhaoliao

docs/src/user-docs/guides-k8s-deployment.md

@@ -200,6 +200,8 @@ clpConfig:
   # Use clp-text, instead of clp-json (default)
   package:
     storage_engine: "clp"  # Use "clp-s" for clp-json, "clp" for clp-text
+
+  webui:
     query_engine: "clp"   # Use "clp-s" for clp-json, "clp" for clp-text, "presto" for Presto
 
   # Configure archive output
@@ -248,30 +250,29 @@ helm template clp . -f custom-values.yaml
 
 ### Using Presto as the query engine
 
-To use [Presto][presto-guide] as the query engine, set `query_engine` to `"presto"` and configure
-the Presto-specific settings. The `query_engine` setting controls which search interface the Web UI
-displays. Presto runs alongside the existing compression pipeline; setting the clp-s native query
-components to `null` is optional but recommended to save resources when you don't need both query
-paths:
+To use [Presto][presto-guide] as the query engine, set `webui.query_engine` to `"presto"` and
+configure the Presto-specific settings. The `query_engine` setting controls which search interface
+the Web UI displays. Presto runs alongside the existing compression pipeline; setting the clp-s
+native query components to `null` is optional but recommended to save resources when you don't need
+both query paths:
 
 ```{code-block} yaml
 :caption: presto-values.yaml
 
 image:
   prestoCoordinator:
     repository: "ghcr.io/y-scope/presto/coordinator"
-    tag: "dev"
+    tag: "clp-v0.10.0"
   prestoWorker:
     repository: "ghcr.io/y-scope/presto/prestissimo-worker"
-    tag: "dev"
+    tag: "clp-v0.10.0"
 
 prestoWorker:
   # See below "Worker scheduling" for more details on configuring Presto scheduling
   replicas: 2
 
 clpConfig:
-  package:
-    storage_engine: "clp-s"
+  webui:
     query_engine: "presto"
 
   # Optional: Disable the clp-s native query pipeline to save resources.

docs/src/user-docs/guides-using-presto.md

@@ -26,9 +26,9 @@ CLP supports Presto through two deployment methods:
 ## Kubernetes (Helm)
 
 When deploying CLP on Kubernetes using Helm, Presto can be enabled by setting `clpConfig.presto` to
-a non-null configuration and `query_engine` to `"presto"`. The `query_engine` setting controls which
-search interface the Web UI displays. Presto runs alongside the existing compression pipeline; the
-clp-s native query components can optionally be disabled to save resources.
+a non-null configuration and `webui.query_engine` to `"presto"`. The `query_engine` setting controls
+which search interface the Web UI displays. Presto runs alongside the existing compression pipeline;
+the clp-s native query components can optionally be disabled to save resources.
 
 ### Requirements
 
@@ -42,7 +42,7 @@ clp-s native query components can optionally be disabled to save resources.
    :caption: presto-values.yaml
 
    clpConfig:
-     package:
+     webui:
        query_engine: "presto"
 
      # Optional: Disable the clp-s native query pipeline to save resources.

docs/src/user-docs/quick-start/clp-text.md

@@ -100,7 +100,7 @@ helm repo update clp
 
 helm install clp clp/clp DOCS_VAR_HELM_VERSION_FLAG \
   --set clpConfig.package.storage_engine=clp \
-  --set clpConfig.package.query_engine=clp \
+  --set clpConfig.webui.query_engine=clp \
   --set clpConfig.webui.port="$CLP_WEBUI_PORT" \
   --set clpConfig.results_cache.port="$CLP_RESULTS_CACHE_PORT" \
   --set clpConfig.database.port="$CLP_DATABASE_PORT" \

tools/deployment/package-helm/templates/configmap.yaml

@@ -127,7 +127,7 @@ data:
     log_ingestor: null
     {{- end }}
     package:
-      query_engine: {{ .Values.clpConfig.package.query_engine | quote }}
+      query_engine: {{ .Values.clpConfig.webui.query_engine | quote }}
       storage_engine: {{ .Values.clpConfig.package.storage_engine | quote }}
     {{- with .Values.clpConfig.query_scheduler }}
     query_scheduler:
@@ -254,7 +254,7 @@ data:
   webui-client-settings.json: |
     {
       "ClpStorageEngine": {{ .Values.clpConfig.package.storage_engine | quote }},
-      "ClpQueryEngine": {{ .Values.clpConfig.package.query_engine | quote }},
+      "ClpQueryEngine": {{ .Values.clpConfig.webui.query_engine | quote }},
       "LogsInputType": {{ .Values.clpConfig.logs_input.type | quote }},
       {{- if eq .Values.clpConfig.logs_input.type "fs" }}
       "LogsInputRootDir": "/mnt/logs",
@@ -323,7 +323,7 @@ data:
         {{ .Values.clpConfig.archive_output.target_encoded_file_size | int }},
       "ArchiveOutputTargetSegmentSize":
         {{ .Values.clpConfig.archive_output.target_segment_size | int }},
-      "ClpQueryEngine": {{ .Values.clpConfig.package.query_engine | quote }},
+      "ClpQueryEngine": {{ .Values.clpConfig.webui.query_engine | quote }},
       "ClpStorageEngine": {{ .Values.clpConfig.package.storage_engine | quote }},
       {{- if .Values.clpConfig.presto }}
       "PrestoHost": "{{ include "clp.fullname" . }}-presto-coordinator",

tools/deployment/package-helm/values.yaml

@@ -11,12 +11,12 @@ image:
     tag: "main"
   prestoCoordinator:
     repository: "ghcr.io/y-scope/presto/coordinator"
-    pullPolicy: "Always"
-    tag: "dev"
+    pullPolicy: "IfNotPresent"
+    tag: "clp-v0.10.0"
   prestoWorker:
     repository: "ghcr.io/y-scope/presto/prestissimo-worker"
-    pullPolicy: "Always"
-    tag: "dev"
+    pullPolicy: "IfNotPresent"
+    tag: "clp-v0.10.0"
 
 # - If false: Single-node deployment.
 #   - Pods automatically tolerate control-plane taints.
@@ -106,7 +106,6 @@ clpConfig:
 
   package:
     storage_engine: "clp-s"
-    query_engine: "clp-s"
 
   # API server config
   api_server:
@@ -185,6 +184,7 @@ clpConfig:
     upsert_interval: 100  # milliseconds
 
   webui:
+    query_engine: "clp-s"
     port: 30000
     results_metadata_collection_name: "results-metadata"
     rate_limit: 1000
@@ -194,7 +194,7 @@ clpConfig:
   #   logging_level: "INFO"
 
   # Presto query engine config. Uncomment to enable Presto deployments. If you want the Web UI to
-  # expose Presto SQL, also set `package.query_engine: "presto"`.
+  # expose Presto SQL, also set `webui.query_engine: "presto"`.
   presto: null
   #   port: 30889
   #   coordinator: