Add add custom environment variables in services (extraEnvVars value) (…

…#170)
InseeFrLab · Oct 30, 2024 · da64b52 · da64b52
1 parent 59a65de
commit da64b52
Show file tree

Hide file tree

Showing 24 changed files with 186 additions and 9 deletions.
diff --git a/charts/jupyter-pyspark/Chart.yaml b/charts/jupyter-pyspark/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: 2.1.8
+version: 2.1.9
 
 dependencies:
   - name: library-chart

diff --git a/charts/jupyter-pyspark/templates/statefulset.yaml b/charts/jupyter-pyspark/templates/statefulset.yaml
@@ -240,6 +240,9 @@ spec:
             - name: DARK_MODE
               value: "true"
             {{- end }}
+            {{- with .Values.extraEnvVars }}
+            {{- tpl (toYaml .) $.Values | nindent 12 }}
+            {{- end }}
           envFrom:
             - secretRef:
                 name: {{ include "library-chart.secretNameToken" . }}

diff --git a/charts/jupyter-pyspark/values.schema.json b/charts/jupyter-pyspark/values.schema.json
@@ -264,6 +264,26 @@
         }
       }
     },
+    "extraEnvVars": {
+      "description": "environment variables available within your service",
+      "type": "array",
+      "default": [],
+      "x-onyxia": {
+        "hidden": true,
+        "overwriteSchemaWith": "ide/extraenv.json"
+      },
+      "items": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "value": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "kubernetes": {
       "description": "configuration of your kubernetes access",
       "type": "object",

diff --git a/charts/jupyter-pyspark/values.yaml b/charts/jupyter-pyspark/values.yaml
@@ -49,6 +49,13 @@ init:
   personalInit: ""
   personalInitArgs: ""
 
+# Array with (templated) extra environment variables to be made accessible within the service
+# e.g:
+# extraEnvVars:
+#   - name: FOO
+#     value: "bar"
+extraEnvVars: []
+
 environment:
   user: onyxia
   group: users

diff --git a/charts/jupyter-python/Chart.yaml b/charts/jupyter-python/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: 2.1.7
+version: 2.1.8
 
 dependencies:
   - name: library-chart

diff --git a/charts/jupyter-python/templates/statefulset.yaml b/charts/jupyter-python/templates/statefulset.yaml
@@ -191,6 +191,9 @@ spec:
             - name: DARK_MODE
               value: "true"
             {{- end }}
+            {{- with .Values.extraEnvVars }}
+            {{- tpl (toYaml .) $.Values | nindent 12 }}
+            {{- end }}
           envFrom:
             - secretRef:
                 name: {{ include "library-chart.secretNameToken" . }}

diff --git a/charts/jupyter-python/values.schema.json b/charts/jupyter-python/values.schema.json
@@ -217,6 +217,26 @@
         }
       }
     },
+    "extraEnvVars": {
+      "description": "environment variables available within your service",
+      "type": "array",
+      "default": [],
+      "x-onyxia": {
+        "hidden": true,
+        "overwriteSchemaWith": "ide/extraenv.json"
+      },
+      "items": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "value": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "kubernetes": {
       "description": "configuration of your kubernetes access",
       "type": "object",

diff --git a/charts/jupyter-python/values.yaml b/charts/jupyter-python/values.yaml
@@ -25,6 +25,13 @@ init:
   personalInit: ""
   personalInitArgs: ""
 
+# Array with (templated) extra environment variables to be made accessible within the service
+# e.g:
+# extraEnvVars:
+#   - name: FOO
+#     value: "bar"
+extraEnvVars: []
+
 environment:
   user: onyxia
   group: users

diff --git a/charts/rstudio-sparkr/Chart.yaml b/charts/rstudio-sparkr/Chart.yaml
@@ -23,7 +23,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: 2.1.6
+version: 2.1.7
 dependencies:
   - name: library-chart
     version: 1.5.28

diff --git a/charts/rstudio-sparkr/templates/statefulset.yaml b/charts/rstudio-sparkr/templates/statefulset.yaml
@@ -215,6 +215,9 @@ spec:
             - name: DARK_MODE
               value: "true"
             {{- end }}
+            {{- with .Values.extraEnvVars }}
+            {{- tpl (toYaml .) $.Values | nindent 12 }}
+            {{- end }}
           envFrom:
             - secretRef:
                 name: {{ include "library-chart.secretNameToken" . }}

diff --git a/charts/rstudio-sparkr/values.schema.json b/charts/rstudio-sparkr/values.schema.json
@@ -222,6 +222,26 @@
         }
       }
     },
+    "extraEnvVars": {
+      "description": "environment variables available within your service",
+      "type": "array",
+      "default": [],
+      "x-onyxia": {
+        "hidden": true,
+        "overwriteSchemaWith": "ide/extraenv.json"
+      },
+      "items": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "value": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "kubernetes": {
       "description": "configuration of your kubernetes access",
       "type": "object",

diff --git a/charts/rstudio-sparkr/values.yaml b/charts/rstudio-sparkr/values.yaml
@@ -49,6 +49,13 @@ init:
   personalInit: ""
   personalInitArgs: ""
 
+# Array with (templated) extra environment variables to be made accessible within the service
+# e.g:
+# extraEnvVars:
+#   - name: FOO
+#     value: "bar"
+extraEnvVars: []
+
 environment:
   root: true
   user: onyxia
@@ -75,7 +82,6 @@ s3:
   secretAccessKey: ""
   sessionToken: ""
 
-
 vault:
   # Specifies whether a config map should be created
   enabled: true
@@ -105,7 +111,6 @@ git:
 # Declare variables to be passed into your templates.
 replicaCount: 1
 
-
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""

diff --git a/charts/rstudio/Chart.yaml b/charts/rstudio/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: 2.1.4
+version: 2.1.5
 dependencies:
   - name: library-chart
     version: 1.5.28

diff --git a/charts/rstudio/templates/statefulset.yaml b/charts/rstudio/templates/statefulset.yaml
@@ -150,6 +150,9 @@ spec:
             - name: DARK_MODE
               value: "true"
             {{- end }}
+            {{- with .Values.extraEnvVars }}
+            {{- tpl (toYaml .) $.Values | nindent 12 }}
+            {{- end }}
           envFrom:
             {{- if .Values.s3.enabled }}
             - secretRef:

diff --git a/charts/rstudio/values.schema.json b/charts/rstudio/values.schema.json
@@ -217,6 +217,26 @@
         }
       }
     },
+    "extraEnvVars": {
+      "description": "environment variables available within your service",
+      "type": "array",
+      "default": [],
+      "x-onyxia": {
+        "hidden": true,
+        "overwriteSchemaWith": "ide/extraenv.json"
+      },
+      "items": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "value": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "kubernetes": {
       "description": "configuration of your kubernetes access",
       "type": "object",

diff --git a/charts/rstudio/values.yaml b/charts/rstudio/values.yaml
@@ -25,6 +25,13 @@ init:
   personalInit: ""
   personalInitArgs: ""
 
+# Array with (templated) extra environment variables to be made accessible within the service
+# e.g:
+# extraEnvVars:
+#   - name: FOO
+#     value: "bar"
+extraEnvVars: []
+
 environment:
   user: onyxia
   group: users

diff --git a/charts/vscode-pyspark/Chart.yaml b/charts/vscode-pyspark/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: 2.1.9
+version: 2.1.10
 
 dependencies:
   - name: library-chart

diff --git a/charts/vscode-pyspark/templates/statefulset.yaml b/charts/vscode-pyspark/templates/statefulset.yaml
@@ -237,6 +237,9 @@ spec:
             - name: DARK_MODE
               value: "true"
             {{- end }}
+            {{- with .Values.extraEnvVars }}
+            {{- tpl (toYaml .) $.Values | nindent 12 }}
+            {{- end }}
           envFrom:
             - secretRef:
                 name: {{ include "library-chart.secretNameToken" . }}

diff --git a/charts/vscode-pyspark/values.schema.json b/charts/vscode-pyspark/values.schema.json
@@ -248,6 +248,26 @@
         }
       }
     },
+    "extraEnvVars": {
+      "description": "environment variables available within your service",
+      "type": "array",
+      "default": [],
+      "x-onyxia": {
+        "hidden": true,
+        "overwriteSchemaWith": "ide/extraenv.json"
+      },
+      "items": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "value": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "kubernetes": {
       "description": "configuration of your kubernetes access",
       "type": "object",

diff --git a/charts/vscode-pyspark/values.yaml b/charts/vscode-pyspark/values.yaml
@@ -49,6 +49,13 @@ init:
   personalInit: ""
   personalInitArgs: ""
 
+# Array with (templated) extra environment variables to be made accessible within the service
+# e.g:
+# extraEnvVars:
+#   - name: FOO
+#     value: "bar"
+extraEnvVars: []
+
 environment:
   user: onyxia
   group: users
@@ -125,7 +132,6 @@ metaflow:
 # Declare variables to be passed into your templates.
 replicaCount: 1
 
-
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""

diff --git a/charts/vscode-python/Chart.yaml b/charts/vscode-python/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: 2.1.8
+version: 2.1.9
 
 dependencies:
   - name: library-chart

diff --git a/charts/vscode-python/templates/statefulset.yaml b/charts/vscode-python/templates/statefulset.yaml
@@ -177,6 +177,9 @@ spec:
             - name: DARK_MODE
               value: "true"
             {{- end }}
+            {{- with .Values.extraEnvVars }}
+            {{- tpl (toYaml .) $.Values | nindent 12 }}
+            {{- end }}
           envFrom:
             - secretRef:
                 name : {{ include "library-chart.secretNameToken" . }}

diff --git a/charts/vscode-python/values.schema.json b/charts/vscode-python/values.schema.json
@@ -226,6 +226,26 @@
         }
       }
     },
+    "extraEnvVars": {
+      "description": "environment variables available within your service",
+      "type": "array",
+      "default": [],
+      "x-onyxia": {
+        "hidden": true,
+        "overwriteSchemaWith": "ide/extraenv.json"
+      },
+      "items": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "value": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "kubernetes": {
       "description": "configuration of your kubernetes access",
       "type": "object",

diff --git a/charts/vscode-python/values.yaml b/charts/vscode-python/values.yaml
@@ -26,6 +26,13 @@ init:
   personalInit: ""
   personalInitArgs: ""
 
+# Array with (templated) extra environment variables to be made accessible within the service
+# e.g:
+# extraEnvVars:
+#   - name: FOO
+#     value: "bar"
+extraEnvVars: []
+
 s3:
   # Specifies whether a config map should be created
   enabled: true