jupyter 0.3.4 hive-metastore 0.0.8 select image tag

InseeFrLab · Mar 11, 2021 · 50720ea · 50720ea
1 parent 245f103
commit 50720ea
Show file tree

Hide file tree

Showing 6 changed files with 158 additions and 4 deletions.
diff --git a/charts/hive-metastore/Chart.yaml b/charts/hive-metastore/Chart.yaml
@@ -15,7 +15,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.7
+version: 0.0.8
 
 # 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
@@ -29,7 +29,49 @@ data:
           <name> hive.metastore.warehouse.dir</name>
           <value>{{ .Values.service.warehouseDir}}</value>
         </property>
-       
+        {{- if .Values.security.networkPolicy.enable }}       
+        <property>
+          <name>fs.s3a.connection.ssl.enabled</name>
+          <value>true</value>
+          <description>Enables or disables SSL connections to S3.</description>
+        </property>
+
+        <property>
+          <name>fs.s3a.endpoint</name>
+          <description>AWS S3 endpoint to connect to. An up-to-date list is
+            provided in the AWS Documentation: regions and endpoints. Without this
+            property, the standard region (s3.amazonaws.com) is assumed.
+          </description>
+          <value>{{ .Values.s3.endpoint }}</value>
+        </property>
 
+        <property>
+          <name>fs.s3a.path.style.access</name>
+          <value>true</value>
+          <description>Enable S3 path style access ie disabling the default virtual hosting behaviour.
+            Useful for S3A-compliant storage providers as it removes the need to set up DNS for virtual hosting.
+          </description>
+        </property>
+
+        <property>
+          <name>fs.s3a.aws.credentials.provider</name>
+          <value>org.apache.hadoop.fs.s3a.TemporaryAWSCredentialsProvider</value>
+        </property>
+
+        <property>
+          <name>fs.s3a.access.key</name>
+          <value>{{ .Values.s3.accessKeyId }}</value>
+        </property>
+
+        <property>
+          <name>fs.s3a.secret.key</name>
+          <value>{{ .Values.s3.secretAccessKey }}</value>
+        </property>
+
+        <property>
+          <name>fs.s3a.session.token</name>
+          <value>{{ .Values.s3.sessionToken }}</value>
+        </property>
+        {{- end }} 
 
     </configuration>
diff --git a/charts/hive-metastore/values.schema.json b/charts/hive-metastore/values.schema.json
@@ -2,6 +2,90 @@
   "$schema": "http://json-schema.org/schema#",
   "type": "object",
   "properties": {
+    "service": {
+      "description": "spark-history specific configuration",
+      "type": "object",
+      "properties": {
+          "warehouseDir": {
+              "description": "directory of access logs",
+              "type": "string",
+              "default": "/user/hive/warehouse/",
+              "x-form": {
+                "value": "s3a://{{user.idep}}/hive-warehouse"
+              }
+          },
+          "image" : {
+            "description": "image docker",
+            "type": "object",  
+            "properties": {
+              "tag": {
+                  "description": "tag",
+                  "type": "string",
+                  "default": "master",
+                  "enum": ["master", "hive-2.3.7"]
+
+              }
+            }        
+          }
+      }
+    },
+    "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
+              }
+          }
+      }
+    },
     "postgres": {
       "description": "postgres specific configuration",
       "type": "object",

diff --git a/charts/hive-metastore/values.yaml b/charts/hive-metastore/values.yaml
@@ -12,6 +12,21 @@ service:
     tag: "master"
   warehouseDir: s3a://bucket/hive-warehouse
 
+environment:
+  s3: true
+
+
+s3:
+  # Specifies whether a config map should be created
+  create: true
+  # The name of the configmap to use.
+  # If not set and create is true, a name is generated using the fullname template
+  configMapName: ""
+  accessKeyId: ""
+  endpoint: ""
+  defaultRegion: ""
+  secretAccessKey: ""
+  sessionToken: ""
 
 liveness:
   enabled : "true"

diff --git a/charts/jupyter/Chart.yaml b/charts/jupyter/Chart.yaml
@@ -16,7 +16,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.3.3
+version: 0.3.4
 
 # 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/jupyter/values.schema.json b/charts/jupyter/values.schema.json
@@ -10,7 +10,20 @@
                     "description": "enable",
                     "type": "boolean",
                     "default": false
-                  }
+                },
+                "image" : {
+                    "description": "image docker",
+                    "type": "object",  
+                    "properties": {
+                      "tag": {
+                          "description": "tag",
+                          "type": "string",
+                          "default": "master",
+                          "enum": ["master", "hive-2.3.7"]
+
+                      }
+                    }        
+                }
             }
         },
         "discovery": {