diff --git a/charts/jena/Chart.yaml b/charts/jena/Chart.yaml index 186e4cf1..c96539b2 100644 --- a/charts/jena/Chart.yaml +++ b/charts/jena/Chart.yaml @@ -23,7 +23,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.0.4 +version: 3.1.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/jena/values.schema.json b/charts/jena/values.schema.json index e16fa897..08d6532c 100644 --- a/charts/jena/values.schema.json +++ b/charts/jena/values.schema.json @@ -113,45 +113,62 @@ "default": "changeme", "x-form": { "value": "{{project.password}}" + }, + "x-onyxia": { + "overwriteDefaultWith": "{{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}}" - } + "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}}" - } + "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}}" - } + "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" } } + } } } }, @@ -167,6 +184,10 @@ "x-form": { "hidden": true, "value": "{{project.id}}-{{k8s.randomSubdomain}}.{{k8s.domain}}" + }, + "x-onyxia": { + "hidden": true, + "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}.{{k8s.domain}}" } } }