hive metastore x-onyxia

InseeFrLab · Jul 13, 2022 · ecfc28a · ecfc28a
1 parent cf8c752
commit ecfc28a
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 24 deletions.
diff --git a/charts/hive-metastore/Chart.yaml b/charts/hive-metastore/Chart.yaml
@@ -25,7 +25,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.2.4
+version: 1.3.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/hive-metastore/templates/configmap.yaml b/charts/hive-metastore/templates/configmap.yaml
@@ -35,7 +35,7 @@ data:
           <name> hive.metastore.warehouse.dir</name>
           <value>{{ .Values.service.warehouseDir}}</value>
         </property>
-        {{- if .Values.environment.s3 }}       
+        {{- if .Values.s3.enabled }}       
         <property>
           <name>fs.s3a.connection.ssl.enabled</name>
           <value>true</value>

diff --git a/charts/hive-metastore/values.schema.json b/charts/hive-metastore/values.schema.json
@@ -12,6 +12,9 @@
               "default": "/user/hive/warehouse/",
               "x-form": {
                 "value": "s3a://{{s3.AWS_BUCKET_NAME}}/hive-warehouse"
+              },
+              "x-onyxia": {
+                  "overwriteDefaultWith": "s3a://{{s3.AWS_BUCKET_NAME}}/hive-warehouse"
               }
           },
           "image" : {
@@ -64,63 +67,87 @@
         }
       }
     },
-    "environment": {
-      "description": "configuration of your environment variables",
+    "s3": {
+      "description": "Configuration of temporary identity",
       "type": "object",
       "properties": {
-          "s3": {
+          "enabled": {
               "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
+                  "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}}",
-                  "hidden": true
+                  "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}}",
-                  "hidden": true
+                  "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}}",
-                  "hidden": true
+                  "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}}",
-                  "hidden": true
+                  "value": "{{s3.AWS_SESSION_TOKEN}}"
+              },
+              "x-onyxia": {
+                  "overwriteDefaultWith": "{{s3.AWS_SESSION_TOKEN}}"
+              },
+              "hidden": {
+                  "value": false,
+                  "path": "s3/enabled"
               }
           }
       }
-    },
+  },
     "security": {
       "description": "security specific configuration",
       "type": "object",
@@ -136,6 +163,9 @@
                 "default": true,
                 "x-form": {
                   "value": "{{region.defaultNetworkPolicy}}"
+                },
+                "x-onyxia": {
+                    "overwriteDefaultWith": "region.defaultNetworkPolicy"
                 }
               }
             }
@@ -161,6 +191,9 @@
               },
               "x-form": {
                 "value": "{{region.kafka.url}}"
+              },
+              "x-onyxia": {
+                "overwriteDefaultWith": "{{region.kafka.url}}"
               }
 
           },
@@ -174,6 +207,9 @@
               },
               "x-form": {
                 "value": "{{region.kafka.topicName}}"
+              },
+              "x-onyxia": {
+                "overwriteDefaultWith": "{{region.kafka.topicName}}"
               }
           },
           "domainNamespace": {
@@ -182,6 +218,9 @@
               "x-form": {
                 "value": "{{project.id}}"
               },
+              "x-onyxia": {
+                "overwriteDefaultWith": "{{project.id}}"
+              },
               "default": "changeMe",
               "hidden": {
                 "value": false,
@@ -206,6 +245,9 @@
               "default": "admin",
               "x-form": {
                 "value": "{{project.id}}"
+              },
+              "x-onyxia": {
+                "overwriteDefaultWith": "{{project.id}}"
               }
             },
             "postgresqlPassword": {
@@ -214,6 +256,9 @@
               "default": "changeme",
               "x-form": {
                 "value": "{{project.password}}"
+              },
+              "x-onyxia": {
+                "overwriteDefaultWith": "{{project.password}}"
               }
             },
             "postgresqlDatabase": {

diff --git a/charts/hive-metastore/values.yaml b/charts/hive-metastore/values.yaml
@@ -24,7 +24,7 @@ environment:
 
 s3:
   # Specifies whether a config map should be created
-  create: true
+  enabled: false
   # The name of the configmap to use.
   # If not set and create is true, a name is generated using the fullname template
   configMapName: ""