vscode add proxy support

Co-authored-by: titigmr <[email protected]>
InseeFrLab · Sep 13, 2024 · 801dac2 · 801dac2
1 parent 7056c3c
commit 801dac2
Show file tree

Hide file tree

Showing 10 changed files with 109 additions and 34 deletions.
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: 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/vscode-pyspark/templates/secret-proxy.yaml b/charts/vscode-pyspark/templates/secret-proxy.yaml
@@ -0,0 +1 @@
+{{ include "library-chart.secretProxy" . }}
diff --git a/charts/vscode-pyspark/templates/statefulset.yaml b/charts/vscode-pyspark/templates/statefulset.yaml
@@ -68,6 +68,11 @@ spec:
           emptyDir:
             medium: Memory
             sizeLimit: 10Gi
+        {{- if (.Values.proxy).enabled }}
+        - name: secret-proxy
+          secret:
+            secretName: {{ include "library-chart.secretNameProxy" . }}
+        {{- end }}
         {{- if .Values.spark.default }}
         - name: secret-sparkconf
           secret:
@@ -218,6 +223,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/vscode-pyspark/values.schema.json b/charts/vscode-pyspark/values.schema.json
@@ -745,39 +745,47 @@
       }
     },
     "proxy": {
-      "description": "Proxy configuration",
+      "description": "It can be used to inject proxy settings in the services",
       "type": "object",
+      "x-onyxia": {
+          "overwriteSchemaWith": "proxy.json"
+      },
       "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}}"
+          "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"
+              }
           }
-        }
       }
-    },
-    "startupProbe": {
+  },
+"startupProbe": {
       "type": "object",
       "description": "Start up probe",
       "default": {},

diff --git a/charts/vscode-pyspark/values.yaml b/charts/vscode-pyspark/values.yaml
@@ -92,6 +92,7 @@ git:
   branch: ""
 
 proxy:
+  enabled: false
   noProxy: ""
   httpProxy: ""
   httpsProxy: ""

diff --git a/charts/vscode-python/Chart.yaml b/charts/vscode-python/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.4
+version: 2.0.5
 
 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/vscode-python/templates/secret-proxy b/charts/vscode-python/templates/secret-proxy
@@ -0,0 +1 @@
+{{ include "library-chart.secretProxy" . }}
diff --git a/charts/vscode-python/templates/statefulset.yaml b/charts/vscode-python/templates/statefulset.yaml
@@ -61,6 +61,11 @@ spec:
           emptyDir:
             medium: Memory
             sizeLimit: 10Gi
+        {{- if (.Values.proxy).enabled }}
+        - name: secret-proxy
+          secret:
+            secretName: {{ include "library-chart.secretNameProxy" . }}
+        {{- end }}
         {{- if .Values.discovery.hive }}
         - name: secret-hive
           secret:
@@ -158,6 +163,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/vscode-python/values.schema.json b/charts/vscode-python/values.schema.json
@@ -790,6 +790,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/vscode-python/values.yaml b/charts/vscode-python/values.yaml
@@ -208,6 +208,11 @@ openshiftSCC:
   enabled: false
   scc: ""
 
+  enabled: false
+  noProxy: ""
+  httpProxy: ""
+  httpsProxy: ""
+
 message:
   fr: ""
-  en: ""
+  en: ""