From a4cca67b69db30e76cdd6a5ceda0a36681445583 Mon Sep 17 00:00:00 2001 From: Comte Date: Mon, 9 Sep 2024 16:07:41 +0200 Subject: [PATCH] openrefine opensearch --- charts/openrefine/Chart.yaml | 2 +- charts/openrefine/values.schema.json | 84 ++++++++-------------------- charts/opensearch/Chart.yaml | 2 +- charts/opensearch/values.schema.json | 70 ++++++++--------------- 4 files changed, 48 insertions(+), 110 deletions(-) diff --git a/charts/openrefine/Chart.yaml b/charts/openrefine/Chart.yaml index 8830d6b9..896d0eaf 100644 --- a/charts/openrefine/Chart.yaml +++ b/charts/openrefine/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.6.4 +version: 4.0.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/openrefine/values.schema.json b/charts/openrefine/values.schema.json index 4b880fb0..e050652e 100644 --- a/charts/openrefine/values.schema.json +++ b/charts/openrefine/values.schema.json @@ -123,70 +123,32 @@ "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}}" - }, - "x-onyxia": { - "overwriteDefaultWith": "region.defaultIpProtection" - } - }, - "ip": { - "type": "string", - "description": "the white list of IP is whitespace", - "title": "Whitelist of IP", - "default": "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" - } + "type": "object", + "description": "Define access policy to the service", + "x-onyxia": { + "overwriteSchemaWith": "network-policy.json" }, - "from": { - "type": "array", - "description": "Array of source allowed to have network access to your service", - "default": [], - "x-form": { - "hidden": true, - "value": "{{region.from}}" - }, - "x-onyxia": { - "hidden": true, - "overwriteDefaultWith": "region.from" - } + "properties": { + "enabled": { + "type": "boolean", + "title": "Enable network policy", + "description": "Only pod from the same namespace will be allowed", + "default": false, + "x-onyxia": { + "overwriteDefaultWith": "region.defaultNetworkPolicy" + } + }, + "from": { + "type": "array", + "description": "Array of source allowed to have network access to your service", + "default": [], + "x-onyxia": { + "hidden": true, + "overwriteDefaultWith": "region.from" + } + } } - } } } }, diff --git a/charts/opensearch/Chart.yaml b/charts/opensearch/Chart.yaml index 32fc8436..ec36a7da 100644 --- a/charts/opensearch/Chart.yaml +++ b/charts/opensearch/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: 0.1.2 +version: 1.0.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/opensearch/values.schema.json b/charts/opensearch/values.schema.json index 7b54d77d..d9278683 100644 --- a/charts/opensearch/values.schema.json +++ b/charts/opensearch/values.schema.json @@ -15,56 +15,32 @@ "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-onyxia": { - "overwriteDefaultWith": "region.defaultIpProtection" - } - }, - "ip": { - "type": "string", - "description": "the white list of IP is whitespace", - "title": "Whitelist of 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-onyxia": { - "overwriteDefaultWith": "region.defaultNetworkPolicy" - } + "type": "object", + "description": "Define access policy to the service", + "x-onyxia": { + "overwriteSchemaWith": "network-policy.json" }, - "from": { - "type": "array", - "description": "Array of source allowed to have network access to your service", - "default": [], - "x-onyxia": { - "hidden": true, - "overwriteDefaultWith": "region.from" - } + "properties": { + "enabled": { + "type": "boolean", + "title": "Enable network policy", + "description": "Only pod from the same namespace will be allowed", + "default": false, + "x-onyxia": { + "overwriteDefaultWith": "region.defaultNetworkPolicy" + } + }, + "from": { + "type": "array", + "description": "Array of source allowed to have network access to your service", + "default": [], + "x-onyxia": { + "hidden": true, + "overwriteDefaultWith": "region.from" + } + } } - } } } },