diff --git a/charts/spark-thrift-server/Chart.yaml b/charts/spark-thrift-server/Chart.yaml index f37921d7..19673c21 100644 --- a/charts/spark-thrift-server/Chart.yaml +++ b/charts/spark-thrift-server/Chart.yaml @@ -22,7 +22,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # 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 # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/spark-thrift-server/values.schema.json b/charts/spark-thrift-server/values.schema.json index 4ec5d503..200b2a80 100644 --- a/charts/spark-thrift-server/values.schema.json +++ b/charts/spark-thrift-server/values.schema.json @@ -60,44 +60,58 @@ "description": "security specific configuration", "type": "object", "properties": { - "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}}" - } - } + "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" } - }, - "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}}" - } - } + }, + "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" + } + } + } + } } }, "ingress": { @@ -112,7 +126,11 @@ "x-form": { "hidden": true, "value": "{{project.id}}-{{k8s.randomSubdomain}}.{{k8s.domain}}" - } + }, + "x-onyxia": { + "hidden": true, + "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}.{{k8s.domain}}" + } } } }, @@ -128,71 +146,86 @@ } } }, - "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" - } - }, - "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" - } - } - } + "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" + } + } } + } } }