diff --git a/charts/rstudio-sparkr/Chart.yaml b/charts/rstudio-sparkr/Chart.yaml index 1498b77d..f00e1232 100644 --- a/charts/rstudio-sparkr/Chart.yaml +++ b/charts/rstudio-sparkr/Chart.yaml @@ -23,9 +23,9 @@ 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: 2.0.3 +version: 2.0.4 dependencies: - name: library-chart - version: 1.5.23 + version: 1.5.25 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/rstudio-sparkr/templates/secret-proxy.yaml b/charts/rstudio-sparkr/templates/secret-proxy.yaml new file mode 100644 index 00000000..03a0eded --- /dev/null +++ b/charts/rstudio-sparkr/templates/secret-proxy.yaml @@ -0,0 +1 @@ +{{ include "library-chart.secretProxy" . }} \ No newline at end of file diff --git a/charts/rstudio-sparkr/templates/statefulset.yaml b/charts/rstudio-sparkr/templates/statefulset.yaml index e8cd6f9d..2a2fd8c1 100644 --- a/charts/rstudio-sparkr/templates/statefulset.yaml +++ b/charts/rstudio-sparkr/templates/statefulset.yaml @@ -66,6 +66,11 @@ spec: secret: secretName: {{ include "library-chart.secretNameCoreSite" . }} {{- end }} + {{- if (.Values.proxy).enabled }} + - name: secret-proxy + secret: + secretName: {{ include "library-chart.secretNameProxy" . }} + {{- end }} {{- if .Values.spark.default }} - name: secret-sparkconf secret: @@ -206,6 +211,10 @@ spec: - secretRef: name: {{ include "library-chart.secretNameGit" . }} {{- end }} + {{- if (.Values.proxy).enabled }} + - secretRef: + name: {{ include "library-chart.secretNameProxy" . }} + {{- end }} {{- if (include "library-chart.repository.enabled" .) }} - configMapRef: name: {{ include "library-chart.configMapNameRepository" . }} diff --git a/charts/rstudio-sparkr/values.schema.json b/charts/rstudio-sparkr/values.schema.json index 9c69d657..515ab503 100644 --- a/charts/rstudio-sparkr/values.schema.json +++ b/charts/rstudio-sparkr/values.schema.json @@ -708,34 +708,42 @@ } }, "proxy": { - "description": "Proxy configuration", + "description": "It can be used to inject proxy settings in the services", "type": "object", + "x-onyxia": { + "overwriteSchemaWith": "proxy.json" + }, "properties": { + "enabled": { + "type": "boolean", + "description": "Inject proxy settings", + "default": "false" + }, "httpProxy": { "type": "string", - "description": "Proxy URL for HTTP requests", + "description": "URL of the enterprise proxy for the region for HTTP.", "default": "", - "x-onyxia": { - "hidden": true, - "overwriteDefaultWith": "{{proxyInjection.httpProxyUrl}}" + "hidden": { + "value": false, + "path": "proxy/enabled" } }, "httpsProxy": { "type": "string", - "description": "Proxy URL for HTTPS requests", + "description": "URL of the enterprise proxy for the region for HTTPS.", "default": "", - "x-onyxia": { - "hidden": true, - "overwriteDefaultWith": "{{proxyInjection.httpsProxyUrl}}" + "hidden": { + "value": false, + "path": "proxy/enabled" } }, "noProxy": { "type": "string", - "description": "Comma separated list of hosts for which proxy is bypassed", + "description": "enterprise local domain that should not take proxy comma separated", "default": "", - "x-onyxia": { - "hidden": true, - "overwriteDefaultWith": "{{proxyInjection.noProxy}}" + "hidden": { + "value": false, + "path": "proxy/enabled" } } } @@ -798,6 +806,53 @@ } } }, + "proxy": { + "description": "It can be used to inject proxy settings in the services", + "type": "object", + "x-onyxia": { + "overwriteSchemaWith": "proxy.json" + }, + "properties": { + "enabled": { + "type": "boolean", + "description": "Inject proxy settings", + "default": "false" + }, + "httpProxy": { + "type": "string", + "description": "URL of the enterprise proxy for the region for HTTP.", + "default": "", + "x-onyxia": { + "hidden": { + "value": true, + "path": "proxy/enabled" + } + } + }, + "httpsProxy": { + "type": "string", + "description": "URL of the enterprise proxy for the region for HTTPS.", + "default": "", + "x-onyxia": { + "hidden": { + "value": true, + "path": "proxy/enabled" + } + } + }, + "noProxy": { + "type": "string", + "description": "enterprise local domain that should not take proxy comma separated", + "default": "", + "x-onyxia": { + "hidden": { + "value": true, + "path": "proxy/enabled" + } + } + } + } + }, "message": { "type": "object", "description": "Warning message", diff --git a/charts/rstudio-sparkr/values.yaml b/charts/rstudio-sparkr/values.yaml index aa35c355..c420db79 100644 --- a/charts/rstudio-sparkr/values.yaml +++ b/charts/rstudio-sparkr/values.yaml @@ -221,6 +221,7 @@ tolerations: [] affinity: {} proxy: + enabled: false noProxy: "" httpProxy: "" httpsProxy: "" @@ -237,4 +238,4 @@ userPreferences: message: fr: "" - en: "" \ No newline at end of file + en: "" diff --git a/charts/rstudio/Chart.yaml b/charts/rstudio/Chart.yaml index d1d59235..2cb14dc3 100644 --- a/charts/rstudio/Chart.yaml +++ b/charts/rstudio/Chart.yaml @@ -22,9 +22,9 @@ 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: 2.0.3 +version: 2.0.4 dependencies: - name: library-chart - version: 1.5.23 + version: 1.5.25 repository: https://inseefrlab.github.io/helm-charts-interactive-services diff --git a/charts/rstudio/templates/secret-proxy.yaml b/charts/rstudio/templates/secret-proxy.yaml new file mode 100644 index 00000000..03a0eded --- /dev/null +++ b/charts/rstudio/templates/secret-proxy.yaml @@ -0,0 +1 @@ +{{ include "library-chart.secretProxy" . }} \ No newline at end of file diff --git a/charts/rstudio/templates/statefulset.yaml b/charts/rstudio/templates/statefulset.yaml index c906980f..508534ab 100644 --- a/charts/rstudio/templates/statefulset.yaml +++ b/charts/rstudio/templates/statefulset.yaml @@ -50,6 +50,11 @@ spec: emptyDir: medium: Memory sizeLimit: 10Gi + {{- if (.Values.proxy).enabled }} + - name: secret-proxy + secret: + secretName: {{ include "library-chart.secretNameProxy" . }} + {{- end }} {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} @@ -109,6 +114,10 @@ spec: - secretRef: name: {{ include "library-chart.secretNameS3" . }} {{- end }} + {{- if (.Values.proxy).enabled }} + - secretRef: + name: {{ include "library-chart.secretNameProxy" . }} + {{- end }} {{- if .Values.vault.enabled }} - secretRef: name: {{ include "library-chart.secretNameVault" . }} diff --git a/charts/rstudio/values.schema.json b/charts/rstudio/values.schema.json index 4c043479..6afe8812 100644 --- a/charts/rstudio/values.schema.json +++ b/charts/rstudio/values.schema.json @@ -730,6 +730,47 @@ } } }, + "proxy": { + "description": "It can be used to inject proxy settings in the services", + "type": "object", + "x-onyxia": { + "overwriteSchemaWith": "proxy.json" + }, + "properties": { + "enabled": { + "type": "boolean", + "description": "Inject proxy settings", + "default": "false" + }, + "httpProxy": { + "type": "string", + "description": "URL of the enterprise proxy for the region for HTTP.", + "default": "", + "hidden": { + "value": false, + "path": "proxy/enabled" + } + }, + "httpsProxy": { + "type": "string", + "description": "URL of the enterprise proxy for the region for HTTPS.", + "default": "", + "hidden": { + "value": false, + "path": "proxy/enabled" + } + }, + "noProxy": { + "type": "string", + "description": "enterprise local domain that should not take proxy comma separated", + "default": "", + "hidden": { + "value": false, + "path": "proxy/enabled" + } + } + } + }, "message": { "type": "object", "description": "Warning message", diff --git a/charts/rstudio/values.yaml b/charts/rstudio/values.yaml index da73d49c..bb147cea 100644 --- a/charts/rstudio/values.yaml +++ b/charts/rstudio/values.yaml @@ -187,6 +187,12 @@ userPreferences: darkMode: false language: "en" +proxy: + enabled: false + noProxy: "" + httpProxy: "" + httpsProxy: "" + message: fr: "" - en: "" \ No newline at end of file + en: ""