delta list of shares

InseeFrLab · Jul 29, 2022 · b962459 · b962459
1 parent 8323898
commit b962459
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 30 deletions.
diff --git a/charts/delta-sharing-server/Chart.yaml b/charts/delta-sharing-server/Chart.yaml
@@ -20,7 +20,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.0
+version: 1.2.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/delta-sharing-server/templates/configmap.yaml b/charts/delta-sharing-server/templates/configmap.yaml
@@ -9,13 +9,7 @@ data:
     # The format version of this config file
     version: 1
     # Config shares/schemas/tables to share
-    shares:
-    - name: "share"
-      schemas:
-      - name: "schema"
-        tables:
-        - name: {{ .Values.share.name | quote }}
-          location: {{ .Values.share.location | quote }}
+    {{ .Values.share }}
     
     # Set the host name that the server will use
     host: {{ .Values.ingress.hostname | quote }}

diff --git a/charts/delta-sharing-server/values.schema.json b/charts/delta-sharing-server/values.schema.json
@@ -85,25 +85,15 @@
     },
     "share": {
       "description": "Share your data",
-      "type": "object",
-      "properties": {
-        "location": {
-          "description": "directory of a delta table",
-          "type": "string",
-          "default": "file://tmp/spark-logs/",
-          "x-form": {
-            "value": "s3a://{{s3.AWS_BUCKET_NAME}}/delta-table/"
-          },
-          "x-onyxia": {
-            "overwriteDefaultWith": "s3a://{{s3.AWS_BUCKET_NAME}}/delta-table/"
-          }
-        },
-        "name": {
-          "description": "name of the table",
-          "type": "string",
-          "default": "table"
-        }        
-      }
+      "type": "string",
+      "render": "textArea",
+      "default": "shares:\n- name: \"share\"\n  schemas:\n  - name: \"schema\"\n  tables:\n  - name: \"name\"\n  location: \"s3a://bucket/delta-table/\"\n",
+      "x-form": {
+        "value": "shares:\n- name: \"share\"\n  schemas:\n  - name: \"schema\"\n  tables:\n  - name: \"name\"\n  location: \"s3a://{{s3.AWS_BUCKET_NAME}}/delta-table/\"\n"
+      },
+      "x-onyxia": {
+        "overwriteDefaultWith": "shares:\n- name: \"share\"\n  schemas:\n  - name: \"schema\"\n  tables:\n  - name: \"name\"\n  location: \"s3a://{{s3.AWS_BUCKET_NAME}}/delta-table/\"\n"
+      }   
     },
     "security": {
       "description": "security specific configuration",

diff --git a/charts/delta-sharing-server/values.yaml b/charts/delta-sharing-server/values.yaml
@@ -38,9 +38,7 @@ s3:
 coresite:
   configMapName: ""
 
-share:
-  name: ""
-  location: ""  
+share: "" 
 
 security:
   networkPolicy: