x-onyxia data-profiler

InseeFrLab · Jul 11, 2022 · 2d278b9 · 2d278b9
1 parent 63c93f5
commit 2d278b9
Show file tree

Hide file tree

Showing 2 changed files with 116 additions and 78 deletions.
diff --git a/charts/data-profiler/Chart.yaml b/charts/data-profiler/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: 0.0.8
+version: 0.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/data-profiler/values.schema.json b/charts/data-profiler/values.schema.json
@@ -2,61 +2,85 @@
   "$schema": "http://json-schema.org/schema#",
   "type": "object",
   "properties": {
-    "environment": {
-      "description": "configuration of your environment variables",
-      "type": "object",
-      "properties": {
-        "s3": {
-          "type": "boolean",
-          "description": "Add S3 temporary identity inside your environment",
-          "default": true
-        }
-      }
-    },
     "s3": {
       "description": "Configuration of temporary identity",
       "type": "object",
       "properties": {
-        "accessKeyId": {
-          "description": "AWS Access Key",
-          "type": "string",
-          "x-form": {
-            "value": "{{s3.AWS_ACCESS_KEY_ID}}",
-            "hidden": true
-          }
-        },
-        "endpoint": {
-          "description": "AWS S3 Endpoint",
-          "type": "string",
-          "x-form": {
-            "value": "{{s3.AWS_S3_ENDPOINT}}",
-            "hidden": true
-          }
-        },
-        "defaultRegion": {
-          "description": "AWS S3 default region",
-          "type": "string",
-          "x-form": {
-            "value": "{{s3.AWS_DEFAULT_REGION}}",
-            "hidden": true
-          }
-        },
-        "secretAccessKey": {
-          "description": "AWS S3 secret access key",
-          "type": "string",
-          "x-form": {
-            "value": "{{s3.AWS_SECRET_ACCESS_KEY}}",
-            "hidden": true
-          }
-        },
-        "sessionToken": {
-          "description": "AWS S3 session Token",
-          "type": "string",
-          "x-form": {
-            "value": "{{s3.AWS_SESSION_TOKEN}}",
-            "hidden": true
+          "enabled": {
+              "type": "boolean",
+              "description": "Add S3 temporary identity inside your environment",
+              "default": true
+          },
+          "accessKeyId": {
+              "description": "AWS Access Key",
+              "type": "string",
+              "x-form": {
+                  "value": "{{s3.AWS_ACCESS_KEY_ID}}"
+              },
+              "x-onyxia": {
+                  "overwriteDefaultWith": "{{s3.AWS_ACCESS_KEY_ID}}"
+              },
+              "hidden": {
+                  "value": false,
+                  "path": "s3/enabled"
+              }
+          },
+          "endpoint": {
+              "description": "AWS S3 Endpoint",
+              "type": "string",
+              "x-form": {
+                  "value": "{{s3.AWS_S3_ENDPOINT}}"
+              },
+              "x-onyxia": {
+                  "overwriteDefaultWith": "{{s3.AWS_S3_ENDPOINT}}"
+              },
+              "hidden": {
+                  "value": false,
+                  "path": "s3/enabled"
+              }
+          },
+          "defaultRegion": {
+              "description": "AWS S3 default region",
+              "type": "string",
+              "x-form": {
+                  "value": "{{s3.AWS_DEFAULT_REGION}}"
+              },
+              "x-onyxia": {
+                  "overwriteDefaultWith": "{{s3.AWS_DEFAULT_REGION}}"
+              },
+              "hidden": {
+                  "value": false,
+                  "path": "s3/enabled"
+              }
+          },
+          "secretAccessKey": {
+              "description": "AWS S3 secret access key",
+              "type": "string",
+              "x-form": {
+                  "value": "{{s3.AWS_SECRET_ACCESS_KEY}}"
+              },
+              "x-onyxia": {
+                  "overwriteDefaultWith": "{{s3.AWS_SECRET_ACCESS_KEY}}"
+              },
+              "hidden": {
+                  "value": false,
+                  "path": "s3/enabled"
+              }
+          },
+          "sessionToken": {
+              "description": "AWS S3 session Token",
+              "type": "string",
+              "x-form": {
+                  "value": "{{s3.AWS_SESSION_TOKEN}}"
+              },
+              "x-onyxia": {
+                  "overwriteDefaultWith": "{{s3.AWS_SESSION_TOKEN}}"
+              },
+              "hidden": {
+                  "value": false,
+                  "path": "s3/enabled"
+              }
           }
-        }
       }
     },
     "ingress": {
@@ -71,41 +95,52 @@
           "x-form": {
             "hidden": true,
             "value": "{{project.id}}-{{k8s.randomSubdomain}}.{{k8s.domain}}"
-        }
+          },
+          "x-onyxia": {
+              "hidden": true,
+              "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}.{{k8s.domain}}"
+          }
         }
       }
     },
     "security": {
       "description": "security specific configuration",
       "type": "object",
       "properties": {
-          "allowlist": {
-              "type": "object",
-              "description": "IP protection",
-              "properties": {
-                "enabled": {
-                  "type": "boolean",
-                  "title": "Enable IP protection",
-                  "description": "Only the configured set of IPs will be able to reach the service",
-                  "default": true,
-                  "x-form": {
-                    "value": "{{region.defaultIpProtection}}"
-                  }
-                },
-                "ip": {
-                  "type": "string",
-                  "description": "the allow list of IP is whitespace",
-                  "title": "Allowed IP",
-                  "x-form": {
-                    "value": "{{user.ip}}"
-                  },
-                  "hidden": {
-                      "value": false,
-                      "path": "security/allowlist/enabled"
-                  } 
-                }
+        "allowlist": {
+          "type": "object",
+          "description": "IP protection",
+          "properties": {
+            "enabled": {
+              "type": "boolean",
+              "title": "Enable IP protection",
+              "description": "Only the configured set of IPs will be able to reach the service",
+              "default": true,
+              "x-form": {
+                "value": "{{region.defaultIpProtection}}"
+              },
+              "x-onyxia": {
+                  "overwriteDefaultWith": "region.defaultIpProtection"
               }
-          },
+            },
+            "ip": {
+              "type": "string",
+              "description": "the allow list of IP is whitespace",
+              "title": "Allowed IP",
+              "default": "0.0.0.0/0",
+              "x-form": {
+                "value": "{{user.ip}}"
+              },
+              "x-onyxia": {
+                "overwriteDefaultWith": "{{user.ip}}"
+              },
+              "hidden": {
+                "value": false,
+                "path": "security/allowlist/enabled"
+              }
+            }
+          }
+      },
           "networkPolicy": {
             "type": "object",
             "description": "Define access policy to the service",
@@ -117,6 +152,9 @@
                 "default": true,
                 "x-form": {
                   "value": "{{region.defaultNetworkPolicy}}"
+                },
+                "x-onyxia": {
+                    "overwriteDefaultWith": "region.defaultNetworkPolicy"
                 }
               }
             }