From bb4fa8d93dc64a3fb92158eb4060678356b799d3 Mon Sep 17 00:00:00 2001 From: Johnny Niklasson Date: Wed, 15 Nov 2023 19:41:36 +0100 Subject: [PATCH] found more fields to be hidden (#77) - Hidden more service fields --- charts/datadoc/Chart.yaml | 2 +- charts/datadoc/values.schema.json | 10 ++++-- charts/rstudio-dapla/Chart.yaml | 2 +- charts/rstudio-dapla/values.schema.json | 1 + charts/statbank-pxwebapi/Chart.yaml | 2 +- charts/statbank-pxwebapi/values.schema.json | 35 +++++++++++++-------- 6 files changed, 34 insertions(+), 18 deletions(-) diff --git a/charts/datadoc/Chart.yaml b/charts/datadoc/Chart.yaml index d499154..853f60e 100644 --- a/charts/datadoc/Chart.yaml +++ b/charts/datadoc/Chart.yaml @@ -24,7 +24,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.2.26 +version: 0.2.27 dependencies: - name: library-chart diff --git a/charts/datadoc/values.schema.json b/charts/datadoc/values.schema.json index 33e4cec..eb55c3d 100644 --- a/charts/datadoc/values.schema.json +++ b/charts/datadoc/values.schema.json @@ -394,12 +394,18 @@ "environmentVariableName": { "type": "string", "description": "Name of the environment variable to use", - "default": "OIDC_TOKEN" + "default": "OIDC_TOKEN", + "x-onyxia": { + "hidden": true + } }, "userAttribute": { "type": "string", "description": "The user attribute to map to the environment variable", - "default": "access_token" + "default": "access_token", + "x-onyxia": { + "hidden": true + } }, "value": { "type": "string", diff --git a/charts/rstudio-dapla/Chart.yaml b/charts/rstudio-dapla/Chart.yaml index 884143e..ce6a57a 100644 --- a/charts/rstudio-dapla/Chart.yaml +++ b/charts/rstudio-dapla/Chart.yaml @@ -21,7 +21,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: 1.1.5 +version: 1.1.6 dependencies: - name: library-chart diff --git a/charts/rstudio-dapla/values.schema.json b/charts/rstudio-dapla/values.schema.json index 1c6cbce..0401037 100644 --- a/charts/rstudio-dapla/values.schema.json +++ b/charts/rstudio-dapla/values.schema.json @@ -180,6 +180,7 @@ "description": "the white list of IP is whitespace", "title": "Whitelist of IP", "x-onyxia": { + "hidden": true, "overwriteDefaultWith": "{{user.ip}}" }, "hidden": { diff --git a/charts/statbank-pxwebapi/Chart.yaml b/charts/statbank-pxwebapi/Chart.yaml index f1ca7e9..a34df58 100644 --- a/charts/statbank-pxwebapi/Chart.yaml +++ b/charts/statbank-pxwebapi/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.1 +version: 0.1.2 dependencies: - name: library-chart diff --git a/charts/statbank-pxwebapi/values.schema.json b/charts/statbank-pxwebapi/values.schema.json index 54ca473..7080039 100644 --- a/charts/statbank-pxwebapi/values.schema.json +++ b/charts/statbank-pxwebapi/values.schema.json @@ -165,15 +165,6 @@ "description": "security specific configuration", "type": "object", "properties": { - "password": { - "type": "string", - "description": "Password", - "default": "changeme", - "render": "password", - "x-onyxia": { - "overwriteDefaultWith": "{{project.password}}" - } - }, "allowlist": { "type": "object", "description": "IP protection", @@ -184,6 +175,7 @@ "description": "Only the configured set of IPs will be able to reach the service", "default": true, "x-onyxia": { + "hidden": true, "overwriteDefaultWith": "region.defaultIpProtection" } }, @@ -192,6 +184,7 @@ "description": "the white list of IP is whitespace", "title": "Whitelist of IP", "x-onyxia": { + "hidden": true, "overwriteDefaultWith": "{{user.ip}}" }, "hidden": { @@ -211,6 +204,7 @@ "description": "Only pod from the same namespace will be allowed", "default": true, "x-onyxia": { + "hidden": true, "overwriteDefaultWith": "region.defaultNetworkPolicy" } }, @@ -233,7 +227,10 @@ "type": "boolean", "title": "Enable service entry", "description": "Enable access to external services", - "default": true + "default": true, + "x-onyxia": { + "hidden": true + } }, "hosts": { "type": "array", @@ -357,12 +354,18 @@ "type": "boolean", "title": "Enable a custom service port", "description": "Enable a custom service port", - "default": false + "default": false, + "x-onyxia": { + "hidden": true + } }, "port": { "type": "integer", "description": "port of the custom service", "title": "Custom service port", + "x-onyxia": { + "hidden": true + }, "hidden": { "value": false, "path": "networking/user/enabled" @@ -380,12 +383,18 @@ "environmentVariableName": { "type": "string", "description": "Name of the environment variable to use", - "default": "OIDC_TOKEN" + "default": "OIDC_TOKEN", + "x-onyxia": { + "hidden": true + } }, "userAttribute": { "type": "string", "description": "The user attribute to map to the environment variable", - "default": "access_token" + "default": "access_token", + "x-onyxia": { + "hidden": true + } }, "value": { "type": "string",