feat: nonProxyHosts config for spark

phlg · Sep 5, 2023 · ff46e95 · ff46e95
1 parent 2c25701
commit ff46e95
Show file tree

Hide file tree

Showing 12 changed files with 147 additions and 24 deletions.
diff --git a/charts/jupyter-pyspark/Chart.yaml b/charts/jupyter-pyspark/Chart.yaml
@@ -24,9 +24,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: 1.29.0
+version: 1.30.0
 
 dependencies:
   - name: library-chart
-    version: 1.4.0
+    version: 1.4.1
     repository: https://inseefrlab.github.io/helm-charts-interactive-services
diff --git a/charts/jupyter-pyspark/README.md b/charts/jupyter-pyspark/README.md
@@ -1,6 +1,6 @@
 # jupyter-pyspark
 
-![Version: 1.29.0](https://img.shields.io/badge/Version-1.29.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 1.30.0](https://img.shields.io/badge/Version-1.30.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 The JupyterLab IDE with PySpark, an interface to use Apache Spark from Python.
 
@@ -15,7 +15,7 @@ The JupyterLab IDE with PySpark, an interface to use Apache Spark from Python.
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://inseefrlab.github.io/helm-charts-interactive-services | library-chart | 1.4.0 |
+| https://inseefrlab.github.io/helm-charts-interactive-services | library-chart | 1.4.1 |
 
 ## Values
 
@@ -70,6 +70,9 @@ The JupyterLab IDE with PySpark, an interface to use Apache Spark from Python.
 | persistence.size | string | `"10Gi"` |  |
 | podAnnotations | object | `{}` |  |
 | podSecurityContext.fsGroup | int | `100` |  |
+| proxy.httpProxy | string | `nil` |  |
+| proxy.httpsProxy | string | `nil` |  |
+| proxy.noProxy | string | `nil` |  |
 | replicaCount | int | `1` |  |
 | repository.condaRepository | string | `""` |  |
 | repository.configMapName | string | `""` |  |
@@ -102,8 +105,8 @@ The JupyterLab IDE with PySpark, an interface to use Apache Spark from Python.
 | serviceAccount.annotations | object | `{}` |  |
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.name | string | `""` |  |
-| spark.config."spark.driver.extraJavaOptions" | string | `"-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }}"` |  |
-| spark.config."spark.executor.extraJavaOptions" | string | `"-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }}"` |  |
+| spark.config."spark.driver.extraJavaOptions" | string | `"-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }} -Dhttp.nonProxyHosts={{ include \"library-chart.sparkNonProxyHosts\" . }} -Dhttps.nonProxyHosts={{ include \"library-chart.sparkNonProxyHosts\" . }}"` |  |
+| spark.config."spark.executor.extraJavaOptions" | string | `"-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }} -Dhttp.nonProxyHosts={{ include \"library-chart.sparkNonProxyHosts\" . }} -Dhttps.nonProxyHosts={{ include \"library-chart.sparkNonProxyHosts\" . }}"` |  |
 | spark.config."spark.kubernetes.authenticate.driver.serviceAccountName" | string | `"{{ include \"library-chart.fullname\" . }}"` |  |
 | spark.config."spark.kubernetes.container.image" | string | `"{{ ternary .Values.service.image.custom.version .Values.service.image.version .Values.service.image.custom.enabled }}"` |  |
 | spark.config."spark.kubernetes.driver.pod.name" | string | `"{{ include \"library-chart.fullname\" . }}-0"` |  |

diff --git a/charts/jupyter-pyspark/values.schema.json b/charts/jupyter-pyspark/values.schema.json
@@ -804,6 +804,39 @@
         }
       }
     },
+    "proxy": {
+      "description": "Proxy configuration",
+      "type": "object",
+      "properties": {
+        "httpProxy": {
+          "type": "string",
+          "description": "Proxy URL for HTTP requests",
+          "default": "",
+          "x-onyxia": {
+            "hidden": true,
+            "overwriteDefaultWith": "{{proxyInjection.httpProxyUrl}}"
+          }
+        },
+        "httpsProxy": {
+          "type": "string",
+          "description": "Proxy URL for HTTPS requests",
+          "default": "",
+          "x-onyxia": {
+            "hidden": true,
+            "overwriteDefaultWith": "{{proxyInjection.httpsProxyUrl}}"
+          }
+        },
+        "noProxy": {
+          "type": "string",
+          "description": "Comma separated list of hosts for which proxy is bypassed",
+          "default": "",
+          "x-onyxia": {
+            "hidden": true,
+            "overwriteDefaultWith": "{{proxyInjection.noProxy}}"
+          }
+        }
+      }
+    },
     "startupProbe": {
       "type": "object",
       "description": "Start up probe",

diff --git a/charts/jupyter-pyspark/values.yaml b/charts/jupyter-pyspark/values.yaml
@@ -19,8 +19,8 @@ spark:
     spark.kubernetes.driver.pod.name: '{{ include "library-chart.fullname" . }}-0'
     spark.kubernetes.namespace: '{{ .Release.Namespace }}'
     spark.kubernetes.container.image: '{{ ternary .Values.service.image.custom.version .Values.service.image.version .Values.service.image.custom.enabled }}'
-    spark.driver.extraJavaOptions: '-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }}'
-    spark.executor.extraJavaOptions: '-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }}'
+    spark.driver.extraJavaOptions: '-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }} -Dhttp.nonProxyHosts={{ include "library-chart.sparkNonProxyHosts" . }} -Dhttps.nonProxyHosts={{ include "library-chart.sparkNonProxyHosts" . }}'
+    spark.executor.extraJavaOptions: '-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }} -Dhttp.nonProxyHosts={{ include "library-chart.sparkNonProxyHosts" . }} -Dhttps.nonProxyHosts={{ include "library-chart.sparkNonProxyHosts" . }}'
   userConfig:
     spark.dynamicAllocation.enabled: "true"
     spark.dynamicAllocation.initialExecutors: "1"
@@ -89,6 +89,11 @@ git:
   repository: ""
   branch: ""
 
+proxy:
+  noProxy: 
+  httpProxy:
+  httpsProxy:
+
 repository:
   configMapName: ""
   pipRepository: ""

diff --git 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: 1.14.0
+version: 1.15.0
 
 dependencies:
   - name: library-chart
-    version: 1.4.0
+    version: 1.4.1
     repository: https://inseefrlab.github.io/helm-charts-interactive-services
diff --git a/charts/rstudio-sparkr/README.md b/charts/rstudio-sparkr/README.md
@@ -1,6 +1,6 @@
 # rstudio-sparkr
 
-![Version: 1.14.0](https://img.shields.io/badge/Version-1.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 1.15.0](https://img.shields.io/badge/Version-1.15.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 The RStudio IDE with a collection of standard data science packages. It includes SparkR, an R package that provides an interface to use Apache Spark from R.
 
@@ -15,7 +15,7 @@ The RStudio IDE with a collection of standard data science packages. It includes
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://inseefrlab.github.io/helm-charts-interactive-services | library-chart | 1.4.0 |
+| https://inseefrlab.github.io/helm-charts-interactive-services | library-chart | 1.4.1 |
 
 ## Values
 
@@ -66,6 +66,9 @@ The RStudio IDE with a collection of standard data science packages. It includes
 | persistence.size | string | `"10Gi"` |  |
 | podAnnotations | object | `{}` |  |
 | podSecurityContext.fsGroup | int | `100` |  |
+| proxy.httpProxy | string | `nil` |  |
+| proxy.httpsProxy | string | `nil` |  |
+| proxy.noProxy | string | `nil` |  |
 | replicaCount | int | `1` |  |
 | repository.configMapName | string | `""` |  |
 | repository.mavenRepository | string | `""` |  |
@@ -98,8 +101,8 @@ The RStudio IDE with a collection of standard data science packages. It includes
 | serviceAccount.annotations | object | `{}` |  |
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.name | string | `""` |  |
-| spark.config."spark.driver.extraJavaOptions" | string | `"-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }}"` |  |
-| spark.config."spark.executor.extraJavaOptions" | string | `"-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }}"` |  |
+| spark.config."spark.driver.extraJavaOptions" | string | `"-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }} -Dhttp.nonProxyHosts={{ include \"library-chart.sparkNonProxyHosts\" . }} -Dhttps.nonProxyHosts={{ include \"library-chart.sparkNonProxyHosts\" . }}"` |  |
+| spark.config."spark.executor.extraJavaOptions" | string | `"-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }} -Dhttp.nonProxyHosts={{ include \"library-chart.sparkNonProxyHosts\" . }} -Dhttps.nonProxyHosts={{ include \"library-chart.sparkNonProxyHosts\" . }}"` |  |
 | spark.config."spark.kubernetes.authenticate.driver.serviceAccountName" | string | `"{{ include \"library-chart.fullname\" . }}"` |  |
 | spark.config."spark.kubernetes.container.image" | string | `"{{ ternary .Values.service.image.custom.version .Values.service.image.version .Values.service.image.custom.enabled }}"` |  |
 | spark.config."spark.kubernetes.driver.pod.name" | string | `"{{ include \"library-chart.fullname\" . }}-0"` |  |

diff --git a/charts/rstudio-sparkr/values.schema.json b/charts/rstudio-sparkr/values.schema.json
@@ -750,6 +750,39 @@
                 }
               }
         },
+        "proxy": {
+            "description": "Proxy configuration",
+            "type": "object",
+            "properties": {
+                "httpProxy": {
+                    "type": "string",
+                    "description": "Proxy URL for HTTP requests",
+                    "default": "",
+                    "x-onyxia": {
+                        "hidden": true,
+                        "overwriteDefaultWith": "{{proxyInjection.httpProxyUrl}}"
+                    }
+                },
+                "httpsProxy": {
+                    "type": "string",
+                    "description": "Proxy URL for HTTPS requests",
+                    "default": "",
+                    "x-onyxia": {
+                        "hidden": true,
+                        "overwriteDefaultWith": "{{proxyInjection.httpsProxyUrl}}"
+                    }
+                },
+                "noProxy": {
+                    "type": "string",
+                    "description": "Comma separated list of hosts for which proxy is bypassed",
+                    "default": "",
+                    "x-onyxia": {
+                        "hidden": true,
+                        "overwriteDefaultWith": "{{proxyInjection.noProxy}}"
+                    }
+                }
+            }
+        },
         "startupProbe": {
             "type": "object",
             "description": "Start up probe",

diff --git a/charts/rstudio-sparkr/values.yaml b/charts/rstudio-sparkr/values.yaml
@@ -18,8 +18,8 @@ spark:
     spark.kubernetes.driver.pod.name: '{{ include "library-chart.fullname" . }}-0'
     spark.kubernetes.namespace: '{{ .Release.Namespace }}'
     spark.kubernetes.container.image: '{{ ternary .Values.service.image.custom.version .Values.service.image.version .Values.service.image.custom.enabled }}'
-    spark.driver.extraJavaOptions: '-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }}'
-    spark.executor.extraJavaOptions: '-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }}'
+    spark.driver.extraJavaOptions: '-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }} -Dhttp.nonProxyHosts={{ include "library-chart.sparkNonProxyHosts" . }} -Dhttps.nonProxyHosts={{ include "library-chart.sparkNonProxyHosts" . }}'
+    spark.executor.extraJavaOptions: '-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }} -Dhttp.nonProxyHosts={{ include "library-chart.sparkNonProxyHosts" . }} -Dhttps.nonProxyHosts={{ include "library-chart.sparkNonProxyHosts" . }}'
   userConfig:
     spark.dynamicAllocation.enabled: "true"
     spark.dynamicAllocation.initialExecutors: "1"
@@ -208,6 +208,11 @@ tolerations: []
 
 affinity: {}
 
+proxy:
+  noProxy: 
+  httpProxy:
+  httpsProxy:
+
 repository:
   configMapName: ""
   packageManagerUrl: ""

diff --git a/charts/vscode-pyspark/Chart.yaml b/charts/vscode-pyspark/Chart.yaml
@@ -24,9 +24,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: 1.1.0
+version: 1.2.0
 
 dependencies:
   - name: library-chart
-    version: 1.4.0
+    version: 1.4.1
     repository: https://inseefrlab.github.io/helm-charts-interactive-services
diff --git a/charts/vscode-pyspark/README.md b/charts/vscode-pyspark/README.md
@@ -1,6 +1,6 @@
 # vscode-pyspark
 
-![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 The Visual Studio Code IDE with PySpark, an interface to use Apache Spark from Python.
 
@@ -15,7 +15,7 @@ The Visual Studio Code IDE with PySpark, an interface to use Apache Spark from P
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://inseefrlab.github.io/helm-charts-interactive-services | library-chart | 1.4.0 |
+| https://inseefrlab.github.io/helm-charts-interactive-services | library-chart | 1.4.1 |
 
 ## Values
 
@@ -70,6 +70,9 @@ The Visual Studio Code IDE with PySpark, an interface to use Apache Spark from P
 | persistence.size | string | `"10Gi"` |  |
 | podAnnotations | object | `{}` |  |
 | podSecurityContext.fsGroup | int | `100` |  |
+| proxy.httpProxy | string | `nil` |  |
+| proxy.httpsProxy | string | `nil` |  |
+| proxy.noProxy | string | `nil` |  |
 | replicaCount | int | `1` |  |
 | repository.condaRepository | string | `""` |  |
 | repository.configMapName | string | `""` |  |
@@ -102,8 +105,8 @@ The Visual Studio Code IDE with PySpark, an interface to use Apache Spark from P
 | serviceAccount.annotations | object | `{}` |  |
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.name | string | `""` |  |
-| spark.config."spark.driver.extraJavaOptions" | string | `"-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }}"` |  |
-| spark.config."spark.executor.extraJavaOptions" | string | `"-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }}"` |  |
+| spark.config."spark.driver.extraJavaOptions" | string | `"-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }} -Dhttp.nonProxyHosts={{ include \"library-chart.sparkNonProxyHosts\" . }} -Dhttps.nonProxyHosts={{ include \"library-chart.sparkNonProxyHosts\" . }}"` |  |
+| spark.config."spark.executor.extraJavaOptions" | string | `"-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }} -Dhttp.nonProxyHosts={{ include \"library-chart.sparkNonProxyHosts\" . }} -Dhttps.nonProxyHosts={{ include \"library-chart.sparkNonProxyHosts\" . }}"` |  |
 | spark.config."spark.kubernetes.authenticate.driver.serviceAccountName" | string | `"{{ include \"library-chart.fullname\" . }}"` |  |
 | spark.config."spark.kubernetes.container.image" | string | `"{{ ternary .Values.service.image.custom.version .Values.service.image.version .Values.service.image.custom.enabled }}"` |  |
 | spark.config."spark.kubernetes.driver.pod.name" | string | `"{{ include \"library-chart.fullname\" . }}-0"` |  |

diff --git a/charts/vscode-pyspark/values.schema.json b/charts/vscode-pyspark/values.schema.json
@@ -803,6 +803,39 @@
         }
       }
     },
+    "proxy": {
+      "description": "Proxy configuration",
+      "type": "object",
+      "properties": {
+        "httpProxy": {
+          "type": "string",
+          "description": "Proxy URL for HTTP requests",
+          "default": "",
+          "x-onyxia": {
+            "hidden": true,
+            "overwriteDefaultWith": "{{proxyInjection.httpProxyUrl}}"
+          }
+        },
+        "httpsProxy": {
+          "type": "string",
+          "description": "Proxy URL for HTTPS requests",
+          "default": "",
+          "x-onyxia": {
+            "hidden": true,
+            "overwriteDefaultWith": "{{proxyInjection.httpsProxyUrl}}"
+          }
+        },
+        "noProxy": {
+          "type": "string",
+          "description": "Comma separated list of hosts for which proxy is bypassed",
+          "default": "",
+          "x-onyxia": {
+            "hidden": true,
+            "overwriteDefaultWith": "{{proxyInjection.noProxy}}"
+          }
+        }
+      }
+    },
     "startupProbe": {
       "type": "object",
       "description": "Start up probe",

diff --git a/charts/vscode-pyspark/values.yaml b/charts/vscode-pyspark/values.yaml
@@ -19,8 +19,8 @@ spark:
     spark.kubernetes.driver.pod.name: '{{ include "library-chart.fullname" . }}-0'
     spark.kubernetes.namespace: '{{ .Release.Namespace }}'
     spark.kubernetes.container.image: '{{ ternary .Values.service.image.custom.version .Values.service.image.version .Values.service.image.custom.enabled }}'
-    spark.driver.extraJavaOptions: '-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }}'
-    spark.executor.extraJavaOptions: '-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }}'
+    spark.driver.extraJavaOptions: '-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }} -Dhttp.nonProxyHosts={{ include "library-chart.sparkNonProxyHosts" . }} -Dhttps.nonProxyHosts={{ include "library-chart.sparkNonProxyHosts" . }}'
+    spark.executor.extraJavaOptions: '-Dcom.amazonaws.sdk.disableCertChecking={{ .Values.spark.disabledCertChecking }} -Dhttp.nonProxyHosts={{ include "library-chart.sparkNonProxyHosts" . }} -Dhttps.nonProxyHosts={{ include "library-chart.sparkNonProxyHosts" . }}'
   userConfig:
     spark.dynamicAllocation.enabled: "true"
     spark.dynamicAllocation.initialExecutors: "1"
@@ -89,6 +89,11 @@ git:
   repository: ""
   branch: ""
 
+proxy:
+  noProxy: 
+  httpProxy:
+  httpsProxy:
+
 repository:
   configMapName: ""
   pipRepository: ""