Removing service fields (#72)

* hiding fields using hidden: true in x-onyxia
statisticsnorway · Nov 15, 2023 · 274b839 · 274b839
1 parent 807c3e2
commit 274b839
Show file tree

Hide file tree

Showing 20 changed files with 107 additions and 112 deletions.
diff --git a/charts/datadoc/Chart.yaml b/charts/datadoc/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: 0.2.25
+version: 0.2.26
 
 dependencies:
   - name: library-chart

diff --git a/charts/datadoc/templates/NOTES.txt b/charts/datadoc/templates/NOTES.txt
@@ -5,4 +5,3 @@
 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,10 +36,14 @@
               ]
             },
             "version": {
-              "description": "supported versions",
+              "description": "datadoc 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",
-              "default": "europe-north1-docker.pkg.dev/artifact-registry-5n/dapla-lab-docker/onyxia/datadoc:master"
+              "pattern": "^[a-z0-9-_./]+(:[a-z0-9-_.]+)?$"
             }
           }
         }
@@ -170,15 +174,6 @@
       "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",
@@ -189,6 +184,7 @@
               "description": "Only the configured set of IPs will be able to reach the service",
               "default": true,
               "x-onyxia": {
+                "hidden": true,
                 "overwriteDefaultWith": "region.defaultIpProtection"
               }
             },
@@ -197,6 +193,7 @@
               "description": "the white list of IP is whitespace",
               "title": "Whitelist of IP",
               "x-onyxia": {
+                "hidden": true,
                 "overwriteDefaultWith": "{{user.ip}}"
               },
               "hidden": {
@@ -216,6 +213,7 @@
               "description": "Only pod from the same namespace will be allowed",
               "default": true,
               "x-onyxia": {
+                "hidden": true,
                 "overwriteDefaultWith": "region.defaultNetworkPolicy"
               }
             },
@@ -238,7 +236,10 @@
               "type": "boolean",
               "title": "Enable service entry",
               "description": "Enable access to external services",
-              "default": true
+              "default": true,
+              "x-onyxia": {
+                "hidden": true
+              }
             },
             "hosts": {
               "type": "array",
@@ -364,12 +365,18 @@
                       "type": "boolean",
                       "title": "Enable a custom service port",
                       "description": "Enable a custom service port",
-                      "default": false
+                      "default": false,
+                      "x-onyxia": {
+                        "hidden": true
+                      }
                   },
                   "port": {
                       "type": "integer",
                       "description": "port of the custom service",
                       "title": "Custom service port",
+                      "x-onyxia": {
+                        "hidden": true
+                      },
                       "hidden": {
                           "value": false,
                           "path": "networking/user/enabled"

diff --git a/charts/jupyter-python-dapla/Chart.yaml b/charts/jupyter-python-dapla/Chart.yaml
@@ -21,7 +21,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: 1.1.10
+version: 1.1.11
 
 dependencies:
   - name: library-chart

diff --git a/charts/jupyter-python-dapla/templates/NOTES.txt b/charts/jupyter-python-dapla/templates/NOTES.txt
@@ -1,7 +1,6 @@
 {{- 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,11 +88,7 @@ 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,19 +39,28 @@
                 "type": "boolean",
                 "title": "Enable hive metastore discovery",
                 "description": "discover your hive metastore service",
-                "default": true
+                "default": true,
+                "x-onyxia": {
+                  "hidden": true
+                }
               },
               "mlflow": {
                 "type": "boolean",
                 "title": "Enable mlflow discovery",
                 "description": "discover your mlflow service",
-                "default": true
+                "default": true,
+                "x-onyxia": {
+                  "hidden": true
+                }
               },
               "metaflow": {
                 "type": "boolean",
                 "title": "Enable metaflow discovery",
                 "description": "discover your metaflow service",
-                "default": true
+                "default": true,
+                "x-onyxia": {
+                  "hidden": true
+                }
               }
             }
         },
@@ -180,15 +189,6 @@
             "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",
@@ -199,6 +199,7 @@
                         "description": "Only the configured set of IPs will be able to reach the service",
                         "default": true,
                         "x-onyxia": {
+                            "hidden": true,
                             "overwriteDefaultWith": "region.defaultIpProtection"
                         }
                       },
@@ -207,6 +208,7 @@
                         "description": "the white list of IP is whitespace",
                         "title": "Whitelist of IP",
                         "x-onyxia": {
+                            "hidden": true,
                             "overwriteDefaultWith": "{{user.ip}}"
                         },
                         "hidden": {
@@ -226,6 +228,7 @@
                         "description": "Only pod from the same namespace will be allowed",
                         "default": true,
                         "x-onyxia": {
+                            "hidden": true,
                             "overwriteDefaultWith": "region.defaultNetworkPolicy"
                         }
                       },
@@ -248,7 +251,10 @@
                       "type": "boolean",
                       "title": "Enable service entry",
                       "description": "Enable access to external services",
-                      "default": true
+                      "default": true,
+                      "x-onyxia": {
+                        "hidden": true
+                      }
                     },
                     "hosts": {
                       "type": "array",
@@ -487,12 +493,18 @@
                     "type": "boolean",
                     "title": "Enable a custom service port",
                     "description": "Enable a custom service port",
-                    "default": false
+                    "default": false,
+                    "x-onyxia": {
+                      "hidden": true
+                    }
                   },
                   "port": {
                     "type": "integer",
                     "description": "port of the custom service",
                     "title": "Custom service port",
+                    "x-onyxia": {
+                      "hidden": true
+                    },
                     "hidden": {
                       "value": false,
                       "path": "networking/user/enabled"

diff --git a/charts/mlflow-dapla/Chart.yaml b/charts/mlflow-dapla/Chart.yaml
@@ -22,7 +22,7 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 1.0.4
+version: 1.0.5
 
 dependencies:
   - name: postgresql

diff --git a/charts/mlflow-dapla/templates/NOTES.txt b/charts/mlflow-dapla/templates/NOTES.txt
@@ -1,7 +1,6 @@
 {{- 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
@@ -38,6 +38,7 @@
           "type": "string",
           "default": "/tmp/mlflow/artifacts/",
           "x-onyxia": {
+            "hidden": true,
             "overwriteDefaultWith": "s3://{{s3.AWS_BUCKET_NAME}}/mlflow-artifacts"
           }
         }
@@ -53,7 +54,7 @@
           "type": "boolean",
           "default": false,
           "x-onyxia": {
-            "hidden": false,
+            "hidden": true,
             "overwriteDefaultWith": "k8s.route"
           }
         },
@@ -62,7 +63,7 @@
           "form": true,
           "title": "Hostname",
           "x-onyxia": {
-            "hidden": false,
+            "hidden": true,
             "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}.{{k8s.domain}}"
           }
         }
@@ -72,14 +73,6 @@
       "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",
@@ -90,6 +83,7 @@
               "description": "Only the configured set of IPs will be able to reach the service",
               "default": true,
               "x-onyxia": {
+                "hidden": true,
                 "overwriteDefaultWith": "region.defaultIpProtection"
               }
             },
@@ -99,6 +93,7 @@
               "title": "Whitelist of IP",
               "default": "0.0.0.0",
               "x-onyxia": {
+                "hidden": true,
                 "overwriteDefaultWith": "{{user.ip}}"
               },
               "hidden": {
@@ -118,6 +113,7 @@
               "description": "Only pod from the same namespace will be allowed",
               "default": true,
               "x-onyxia": {
+                "hidden": true,
                 "overwriteDefaultWith": "region.defaultNetworkPolicy"
               }
             },
@@ -142,7 +138,10 @@
           "type": "boolean",
           "title": "Enable service entry",
           "description": "Enable access to external services",
-          "default": true
+          "default": true,
+          "x-onyxia": {
+            "hidden": true
+          }
         },
         "hosts": {
           "type": "array",
@@ -298,6 +297,7 @@
               "title": "User",
               "default": "user",
               "x-onyxia": {
+                "hidden": true,
                 "overwriteDefaultWith": "{{project.id}}"
               }
             },
@@ -306,6 +306,7 @@
               "title": "User Password",
               "default": "changeme",
               "x-onyxia": {
+                "hidden": true,
                 "overwriteDefaultWith": "{{project.password}}"
               }
             },
@@ -314,6 +315,7 @@
               "title": "Admin Password",
               "default": "changeme",
               "x-onyxia": {
+                "hidden": true,
                 "overwriteDefaultWith": "{{project.password}}"
               }
             },

diff --git a/charts/rstudio-dapla/Chart.yaml b/charts/rstudio-dapla/Chart.yaml
@@ -21,7 +21,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: 1.1.4
+version: 1.1.5
 
 dependencies:
   - name: library-chart

diff --git a/charts/rstudio-dapla/templates/NOTES.txt b/charts/rstudio-dapla/templates/NOTES.txt
@@ -2,9 +2,6 @@
 - 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: {{ .Values.security.password }}
+              value: ""
             - name: PROJECT_USER
               value: {{ .Values.environment.user }}
             - name: PROJECT_GROUP