From 3cd6ccfceca8a0ba0e6f936b306ee68bfb4123b0 Mon Sep 17 00:00:00 2001 From: fcomte Date: Fri, 15 Jul 2022 14:26:48 +0000 Subject: [PATCH] trino x-onyxia --- charts/trino/Chart.yaml | 2 +- charts/trino/values.schema.json | 251 ++++++++++++++++++-------------- 2 files changed, 144 insertions(+), 109 deletions(-) diff --git a/charts/trino/Chart.yaml b/charts/trino/Chart.yaml index 9881c95b..acac58ba 100644 --- a/charts/trino/Chart.yaml +++ b/charts/trino/Chart.yaml @@ -19,7 +19,7 @@ type: application # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.1.0 +version: 3.2.0 # This is the version number of the application being deployed. This version number should be diff --git a/charts/trino/values.schema.json b/charts/trino/values.schema.json index 317a624a..505c4e01 100644 --- a/charts/trino/values.schema.json +++ b/charts/trino/values.schema.json @@ -219,6 +219,9 @@ "default": "admin", "x-form": { "value": "{{project.id}}" + }, + "x-onyxia": { + "overwriteDefaultWith": "{{project.id}}" } }, "password": { @@ -227,118 +230,146 @@ "default": "changeme", "x-form": { "value": "{{project.password}}" - } - }, - "allowlist": { - "type": "object", - "description": "IP protection", - "properties": { - "enabled": { - "type": "boolean", - "title": "Enable IP protection", - "description": "Only the configured set of IPs will be able to reach the service", - "default": true, - "x-form": { - "value": "{{region.defaultIpProtection}}" - } - }, - "ip": { - "type": "string", - "description": "the white list of IP is whitespace", - "title": "Whitelist of IP", - "x-form": { - "value": "{{user.ip}}" - }, - "hidden": { - "value": false, - "path": "security/allowlist/enabled" - } - } - } - }, - "networkPolicy": { - "type": "object", - "description": "Define access policy to the service", - "properties": { - "enabled": { - "type": "boolean", - "title": "Enable network policy", - "description": "Only pod from the same namespace will be allowed", - "default": true, - "x-form": { - "value": "{{region.defaultNetworkPolicy}}" - } - } - } - } - } - }, - "s3": { - "description": "Configuration of temporary identity", - "type": "object", - "properties": { - "enabled": { - "type": "boolean", - "description": "Add S3 temporary identity inside your environment", - "default": true - }, - "accessKeyId": { - "description": "AWS Access Key", - "type": "string", - "x-form": { - "value": "{{s3.AWS_ACCESS_KEY_ID}}" - }, - "hidden": { - "value": false, - "path": "s3/enabled" - } - }, - "endpoint": { - "description": "AWS S3 Endpoint", - "type": "string", - "x-form": { - "value": "{{s3.AWS_S3_ENDPOINT}}" - }, - "hidden": { - "value": false, - "path": "s3/enabled" - } - }, - "defaultRegion": { - "description": "AWS S3 default region", - "type": "string", - "x-form": { - "value": "{{s3.AWS_DEFAULT_REGION}}" }, - "hidden": { - "value": false, - "path": "s3/enabled" + "x-onyxia": { + "overwriteDefaultWith": "{{project.password}}" } }, - "secretAccessKey": { - "description": "AWS S3 secret access key", - "type": "string", - "x-form": { - "value": "{{s3.AWS_SECRET_ACCESS_KEY}}" - }, - "hidden": { - "value": false, - "path": "s3/enabled" - } - }, - "sessionToken": { - "description": "AWS S3 session Token", - "type": "string", - "x-form": { - "value": "{{s3.AWS_SESSION_TOKEN}}" - }, - "hidden": { - "value": false, - "path": "s3/enabled" - } - } + "allowlist": { + "type": "object", + "description": "IP protection", + "properties": { + "enabled": { + "type": "boolean", + "title": "Enable IP protection", + "description": "Only the configured set of IPs will be able to reach the service", + "default": true, + "x-form": { + "value": "{{region.defaultIpProtection}}" + }, + "x-onyxia": { + "overwriteDefaultWith": "region.defaultIpProtection" + } + }, + "ip": { + "type": "string", + "description": "the allow list of IP is whitespace", + "title": "Allowed IP", + "default": "0.0.0.0/0", + "x-form": { + "value": "{{user.ip}}" + }, + "x-onyxia": { + "overwriteDefaultWith": "{{user.ip}}" + }, + "hidden": { + "value": false, + "path": "security/allowlist/enabled" + } + } + } + }, + "networkPolicy": { + "type": "object", + "description": "Define access policy to the service", + "properties": { + "enabled": { + "type": "boolean", + "title": "Enable network policy", + "description": "Only pod from the same namespace will be allowed", + "default": true, + "x-form": { + "value": "{{region.defaultNetworkPolicy}}" + }, + "x-onyxia": { + "overwriteDefaultWith": "region.defaultNetworkPolicy" + } + } + } + } } }, + "s3": { + "description": "Configuration of temporary identity", + "type": "object", + "properties": { + "enabled": { + "type": "boolean", + "description": "Add S3 temporary identity inside your environment", + "default": true + }, + "accessKeyId": { + "description": "AWS Access Key", + "type": "string", + "x-form": { + "value": "{{s3.AWS_ACCESS_KEY_ID}}" + }, + "x-onyxia": { + "overwriteDefaultWith": "{{s3.AWS_ACCESS_KEY_ID}}" + }, + "hidden": { + "value": false, + "path": "s3/enabled" + } + }, + "endpoint": { + "description": "AWS S3 Endpoint", + "type": "string", + "x-form": { + "value": "{{s3.AWS_S3_ENDPOINT}}" + }, + "x-onyxia": { + "overwriteDefaultWith": "{{s3.AWS_S3_ENDPOINT}}" + }, + "hidden": { + "value": false, + "path": "s3/enabled" + } + }, + "defaultRegion": { + "description": "AWS S3 default region", + "type": "string", + "x-form": { + "value": "{{s3.AWS_DEFAULT_REGION}}" + }, + "x-onyxia": { + "overwriteDefaultWith": "{{s3.AWS_DEFAULT_REGION}}" + }, + "hidden": { + "value": false, + "path": "s3/enabled" + } + }, + "secretAccessKey": { + "description": "AWS S3 secret access key", + "type": "string", + "x-form": { + "value": "{{s3.AWS_SECRET_ACCESS_KEY}}" + }, + "x-onyxia": { + "overwriteDefaultWith": "{{s3.AWS_SECRET_ACCESS_KEY}}" + }, + "hidden": { + "value": false, + "path": "s3/enabled" + } + }, + "sessionToken": { + "description": "AWS S3 session Token", + "type": "string", + "x-form": { + "value": "{{s3.AWS_SESSION_TOKEN}}" + }, + "x-onyxia": { + "overwriteDefaultWith": "{{s3.AWS_SESSION_TOKEN}}" + }, + "hidden": { + "value": false, + "path": "s3/enabled" + } + } + } + }, "ingress": { "type": "object", "form": true, @@ -350,7 +381,11 @@ "title": "Hostname", "x-form": { "value": "{{project.id}}-{{k8s.randomSubdomain}}.{{k8s.domain}}" - } + }, + "x-onyxia": { + "hidden": true, + "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}.{{k8s.domain}}" + } } } }