Revert "refactored service options" (#70)

* Revert "refactored service options (#67)" This reverts commit f31ff9b. * bump versions
statisticsnorway · Nov 15, 2023 · db6806a · db6806a
1 parent 25bb957
commit db6806a
Show file tree

Hide file tree

Showing 15 changed files with 104 additions and 53 deletions.
diff --git a/charts/datadoc/templates/NOTES.txt b/charts/datadoc/templates/NOTES.txt
@@ -5,3 +5,4 @@
 If you don't run your custom service you will get a 502 bad gateway error.
 {{- end }}
 {{- end }}
+- Your access token is **{{ .Values.security.password }}**
diff --git a/charts/datadoc/values.schema.json b/charts/datadoc/values.schema.json
@@ -36,14 +36,10 @@
               ]
             },
             "version": {
-              "description": "datadoc supported versions",
+              "description": "supported versions",
               "type": "string",
-              "default": "europe-north1-docker.pkg.dev/artifact-registry-5n/dapla-lab-docker/onyxia/datadoc:master",
-              "listEnum": [
-                "europe-north1-docker.pkg.dev/artifact-registry-5n/dapla-lab-docker/onyxia/datadoc:master"
-              ],
               "render": "list",
-              "pattern": "^[a-z0-9-_./]+(:[a-z0-9-_.]+)?$"
+              "default": "europe-north1-docker.pkg.dev/artifact-registry-5n/dapla-lab-docker/onyxia/datadoc:master"
             }
           }
         }
@@ -174,6 +170,15 @@
       "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",
@@ -183,7 +188,6 @@
               "title": "Enable IP protection",
               "description": "Only the configured set of IPs will be able to reach the service",
               "default": true,
-              "hidden": true,
               "x-onyxia": {
                 "overwriteDefaultWith": "region.defaultIpProtection"
               }
@@ -211,7 +215,6 @@
               "title": "Enable network policy",
               "description": "Only pod from the same namespace will be allowed",
               "default": true,
-              "hidden": true,
               "x-onyxia": {
                 "overwriteDefaultWith": "region.defaultNetworkPolicy"
               }
@@ -235,8 +238,7 @@
               "type": "boolean",
               "title": "Enable service entry",
               "description": "Enable access to external services",
-              "default": true,
-              "hidden": true
+              "default": true
             },
             "hosts": {
               "type": "array",
@@ -362,8 +364,7 @@
                       "type": "boolean",
                       "title": "Enable a custom service port",
                       "description": "Enable a custom service port",
-                      "default": false,
-                      "hidden": true
+                      "default": false
                   },
                   "port": {
                       "type": "integer",

diff --git a/charts/jupyter-python-dapla/templates/NOTES.txt b/charts/jupyter-python-dapla/templates/NOTES.txt
@@ -1,6 +1,7 @@
 {{- if .Values.istio.enabled }}
 - You can connect to this jupyter with your browser on this [link](https://{{ .Values.istio.hostname }})
 {{- end }}
+- Your access token is **{{ .Values.security.password }}**
 
 *NOTES about deletion :*
 

diff --git a/charts/jupyter-python-dapla/templates/statefulset.yaml b/charts/jupyter-python-dapla/templates/statefulset.yaml
@@ -88,7 +88,11 @@ spec:
             - name: NB_USER
               value: {{ .Values.environment.user }}
             - name: PASSWORD
+              {{- if .Values.security.oauth2.enabled}}
               value: ""
+              {{- else }}
+              value: {{ .Values.security.password }}
+              {{- end }}
             - name: PROJECT_USER
               value: {{ .Values.environment.user }}
             - name: PROJECT_GROUP

diff --git a/charts/jupyter-python-dapla/values.schema.json b/charts/jupyter-python-dapla/values.schema.json
@@ -39,22 +39,19 @@
                 "type": "boolean",
                 "title": "Enable hive metastore discovery",
                 "description": "discover your hive metastore service",
-                "default": true,
-                "hidden": true
+                "default": true
               },
               "mlflow": {
                 "type": "boolean",
                 "title": "Enable mlflow discovery",
                 "description": "discover your mlflow service",
-                "default": true,
-                "hidden": true
+                "default": true
               },
               "metaflow": {
                 "type": "boolean",
                 "title": "Enable metaflow discovery",
                 "description": "discover your metaflow service",
-                "default": true,
-                "hidden": true
+                "default": true
               }
             }
         },
@@ -183,6 +180,15 @@
             "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",
@@ -192,7 +198,6 @@
                         "title": "Enable IP protection",
                         "description": "Only the configured set of IPs will be able to reach the service",
                         "default": true,
-                        "hidden": true,
                         "x-onyxia": {
                             "overwriteDefaultWith": "region.defaultIpProtection"
                         }
@@ -220,7 +225,6 @@
                         "title": "Enable network policy",
                         "description": "Only pod from the same namespace will be allowed",
                         "default": true,
-                        "hidden": true,
                         "x-onyxia": {
                             "overwriteDefaultWith": "region.defaultNetworkPolicy"
                         }
@@ -244,8 +248,7 @@
                       "type": "boolean",
                       "title": "Enable service entry",
                       "description": "Enable access to external services",
-                      "default": true,
-                      "hidden": true
+                      "default": true
                     },
                     "hosts": {
                       "type": "array",
@@ -484,8 +487,7 @@
                     "type": "boolean",
                     "title": "Enable a custom service port",
                     "description": "Enable a custom service port",
-                    "default": false,
-                    "hidden": true
+                    "default": false
                   },
                   "port": {
                     "type": "integer",

diff --git a/charts/mlflow-dapla/templates/NOTES.txt b/charts/mlflow-dapla/templates/NOTES.txt
@@ -1,6 +1,7 @@
 {{- if .Values.istio.enabled }}
 - You can connect to the mlflow UI with your browser on this [link](https://{{ .Values.istio.hostname }})
 {{- end }}
+- Your access token is **{{ .Values.security.password }}**
 
 *NOTES about deletion :*
 

diff --git a/charts/mlflow-dapla/values.schema.json b/charts/mlflow-dapla/values.schema.json
@@ -52,7 +52,6 @@
           "description": "Enable route",
           "type": "boolean",
           "default": false,
-          "hidden": true,
           "x-onyxia": {
             "hidden": false,
             "overwriteDefaultWith": "k8s.route"
@@ -62,7 +61,6 @@
           "type": "string",
           "form": true,
           "title": "Hostname",
-          "hidden": true,
           "x-onyxia": {
             "hidden": false,
             "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}.{{k8s.domain}}"
@@ -74,6 +72,14 @@
       "description": "security specific configuration",
       "type": "object",
       "properties": {
+        "password": {
+          "type": "string",
+          "description": "Password",
+          "default": "changeme",
+          "x-onyxia": {
+            "overwriteDefaultWith": "{{project.password}}"
+          }
+        },
         "allowlist": {
           "type": "object",
           "description": "IP protection",
@@ -136,8 +142,7 @@
           "type": "boolean",
           "title": "Enable service entry",
           "description": "Enable access to external services",
-          "default": true,
-          "hidden": true
+          "default": true
         },
         "hosts": {
           "type": "array",
@@ -292,7 +297,6 @@
               "type": "string",
               "title": "User",
               "default": "user",
-              "hidden": true,
               "x-onyxia": {
                 "overwriteDefaultWith": "{{project.id}}"
               }
@@ -301,7 +305,6 @@
               "type": "string",
               "title": "User Password",
               "default": "changeme",
-              "hidden": true,
               "x-onyxia": {
                 "overwriteDefaultWith": "{{project.password}}"
               }
@@ -310,7 +313,6 @@
               "type": "string",
               "title": "Admin Password",
               "default": "changeme",
-              "hidden": true,
               "x-onyxia": {
                 "overwriteDefaultWith": "{{project.password}}"
               }

diff --git a/charts/rstudio-dapla/templates/NOTES.txt b/charts/rstudio-dapla/templates/NOTES.txt
@@ -2,6 +2,9 @@
 - You can connect to this rstudio with your browser on this [link](https://{{ .Values.istio.hostname }})
 {{- end }}
 
+- The login is **{{ .Values.environment.user }}**
+- The password is **{{ .Values.security.password }}**
+
 *NOTES about deletion :*
 
 {{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}

diff --git a/charts/rstudio-dapla/templates/statefulset.yaml b/charts/rstudio-dapla/templates/statefulset.yaml
@@ -67,7 +67,7 @@ spec:
             - name: IMAGE_NAME
               value: "{{ .Values.service.image.version }}"
             - name: PASSWORD
-              value: ""
+              value: {{ .Values.security.password }}
             - name: PROJECT_USER
               value: {{ .Values.environment.user }}
             - name: PROJECT_GROUP

diff --git a/charts/rstudio-dapla/values.schema.json b/charts/rstudio-dapla/values.schema.json
@@ -161,6 +161,15 @@
             "description": "RStudio 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",
@@ -170,7 +179,6 @@
                             "title": "Enable IP protection",
                             "description": "Only the configured set of IPs will be able to reach the service",
                             "default": true,
-                            "hidden": true,
                             "x-onyxia": {
                                 "overwriteDefaultWith": "region.defaultIpProtection"
                             }
@@ -198,7 +206,6 @@
                             "title": "Enable network policy",
                             "description": "Only pod from the same namespace will be allowed",
                             "default": true,
-                            "hidden": true,
                             "x-onyxia": {
                                 "overwriteDefaultWith": "region.defaultNetworkPolicy"
                             }
@@ -222,8 +229,7 @@
                             "type": "boolean",
                             "title": "Enable service entry",
                             "description": "Enable access to external services",
-                            "default": true,
-                            "hidden": true
+                            "default": true
                         },
                         "hosts": {
                             "type": "array",
@@ -497,8 +503,7 @@
                             "type": "boolean",
                             "title": "Enable a custom service port",
                             "description": "Enable a custom service port",
-                            "default": false,
-                            "hidden": true
+                            "default": false
                         },
                         "port": {
                             "type": "integer",

diff --git a/charts/vscode-python/README.md b/charts/vscode-python/README.md
@@ -32,6 +32,8 @@ The Visual Studio Code IDE with Python, Julia, and a collection of standard data
 | discovery.mlflow | bool | `true` |  |
 | environment.group | string | `"users"` |  |
 | environment.user | string | `"onyxia"` |  |
+| fauxpilot.enabled | bool | `false` |  |
+| fauxpilot.server | string | `"http://fauxpilot-proxy.fauxpilot:5000/v1/engines"` |  |
 | fullnameOverride | string | `""` |  |
 | git.branch | string | `""` |  |
 | git.cache | string | `""` |  |

diff --git a/charts/vscode-python/templates/NOTES.txt b/charts/vscode-python/templates/NOTES.txt
@@ -1,3 +1,4 @@
 {{- if .Values.istio.enabled }}
 - You can connect to this vscode with your browser on this [link](https://{{ .Values.istio.hostname }})
 {{- end }}
+- Your access token is **{{ .Values.security.password }}**
diff --git a/charts/vscode-python/templates/statefulset.yaml b/charts/vscode-python/templates/statefulset.yaml
@@ -96,13 +96,17 @@ spec:
               value: {{ .Values.init.personalInitArgs }}
             {{- end }}
             - name: PASSWORD
-              value: ""
+              value: {{ .Values.security.password }}  
             - name: PROJECT_USER
               value: {{ .Values.environment.user }}
             - name: PROJECT_GROUP
               value: {{ .Values.environment.group }}
             - name: ROOT_PROJECT_DIRECTORY
               value: /home/{{ .Values.environment.user }}/work  
+            {{- if  .Values.fauxpilot.enabled }}
+            - name: FAUXPILOT_SERVER
+              value: "{{ .Values.fauxpilot.server }}" 
+            {{- end }}
           envFrom:
             {{- if .Values.oidc.enabled }}
             - configMapRef: