chore(trino): rename env-vars

This commit is contained in:
Masaki Yatsu
2025-10-28 21:48:37 +09:00
parent 2092e7e9fb
commit fd0c359407
3 changed files with 14 additions and 13 deletions

View File

@@ -348,8 +348,8 @@ The `lakekeeper` scope controls whether the JWT token includes the audience clai
- Web UI OAuth2: User login via browser (Authorization Code Flow) - Web UI OAuth2: User login via browser (Authorization Code Flow)
- Iceberg REST Catalog OAuth2: Service-to-service authentication (Client Credentials Flow) - Iceberg REST Catalog OAuth2: Service-to-service authentication (Client Credentials Flow)
- The `lakekeeper` scope controls the audience claim: - The `lakekeeper` scope controls the audience claim:
- With scope: `scope=openid profile lakekeeper` → JWT includes `"aud": "lakekeeper"` - With scope: `scope=openid profile lakekeeper` → JWT includes `"aud": "lakekeeper"`
- Without scope: `scope=openid profile` → JWT does not include Lakekeeper audience - Without scope: `scope=openid profile` → JWT does not include Lakekeeper audience
- The `lakekeeper` scope is only used for Trino→Lakekeeper communication, not for user authentication - The `lakekeeper` scope is only used for Trino→Lakekeeper communication, not for user authentication
#### Example Usage #### Example Usage

View File

@@ -16,9 +16,10 @@ export TRINO_WORKER_CPU := env("TRINO_WORKER_CPU", "2")
export TRINO_WORKER_JVM_HEAP := env("TRINO_WORKER_JVM_HEAP", "4G") export TRINO_WORKER_JVM_HEAP := env("TRINO_WORKER_JVM_HEAP", "4G")
export TRINO_WORKER_COUNT := env("TRINO_WORKER_COUNT", "2") export TRINO_WORKER_COUNT := env("TRINO_WORKER_COUNT", "2")
export TRINO_POSTGRES_ENABLED := env("TRINO_POSTGRES_ENABLED", "true") export TRINO_POSTGRES_ENABLED := env("TRINO_POSTGRES_ENABLED", "true")
export TRINO_MINIO_ENABLED := env("TRINO_MINIO_ENABLED", "") export TRINO_ICEBERG_ENABLED := env("TRINO_ICEBERG_ENABLED", "")
export POSTGRES_NAMESPACE := env("POSTGRES_NAMESPACE", "postgres") export POSTGRES_NAMESPACE := env("POSTGRES_NAMESPACE", "postgres")
export MINIO_NAMESPACE := env("MINIO_NAMESPACE", "minio") export MINIO_NAMESPACE := env("MINIO_NAMESPACE", "minio")
export LAKEKEEPER_NAMESPACE := env("LAKEKEEPER_NAMESPACE", "lakekeeper")
[private] [private]
default: default:
@@ -264,12 +265,12 @@ install:
just setup-postgres-catalog just setup-postgres-catalog
if [ -z "${TRINO_MINIO_ENABLED}" ]; then if [ -z "${TRINO_ICEBERG_ENABLED}" ]; then
if gum confirm "Enable Iceberg catalog with Lakekeeper and MinIO?"; then if gum confirm "Enable Iceberg catalog with Lakekeeper and MinIO?"; then
just enable-iceberg-catalog just enable-iceberg-catalog
TRINO_MINIO_ENABLED="true" TRINO_ICEBERG_ENABLED="true"
else else
TRINO_MINIO_ENABLED="false" TRINO_ICEBERG_ENABLED="false"
fi fi
fi fi
@@ -303,13 +304,13 @@ upgrade:
echo "Upgrading Trino..." echo "Upgrading Trino..."
if [ -z "${TRINO_MINIO_ENABLED}" ]; then if [ -z "${TRINO_ICEBERG_ENABLED}" ]; then
if kubectl get secret trino-minio-secret -n ${TRINO_NAMESPACE} &>/dev/null; then if kubectl get secret trino-minio-secret -n ${TRINO_NAMESPACE} &>/dev/null; then
TRINO_MINIO_ENABLED="true" TRINO_ICEBERG_ENABLED="true"
echo "MinIO storage: enabled" echo "Iceberg catalog: enabled"
else else
TRINO_MINIO_ENABLED="false" TRINO_ICEBERG_ENABLED="false"
echo "MinIO storage: disabled" echo "Iceberg catalog: disabled"
fi fi
fi fi

View File

@@ -92,7 +92,7 @@ catalogs:
connector.name=tpch connector.name=tpch
tpch.splits-per-node=4 tpch.splits-per-node=4
{{- if .Env.TRINO_MINIO_ENABLED }} {{- if .Env.TRINO_ICEBERG_ENABLED }}
iceberg: | iceberg: |
connector.name=iceberg connector.name=iceberg
iceberg.catalog.type=rest iceberg.catalog.type=rest
@@ -312,7 +312,7 @@ env:
name: trino-postgres-secret name: trino-postgres-secret
key: password key: password
{{- end }} {{- end }}
{{- if .Env.TRINO_MINIO_ENABLED }} {{- if .Env.TRINO_ICEBERG_ENABLED }}
- name: MINIO_ACCESS_KEY - name: MINIO_ACCESS_KEY
valueFrom: valueFrom:
secretKeyRef: secretKeyRef: