From 50720ea976765f625f841852f1205b89acede183 Mon Sep 17 00:00:00 2001 From: tm8enk Date: Thu, 11 Mar 2021 12:43:59 +0000 Subject: [PATCH] jupyter 0.3.4 hive-metastore 0.0.8 select image tag --- charts/hive-metastore/Chart.yaml | 2 +- .../hive-metastore/templates/configmap.yaml | 44 +++++++++- charts/hive-metastore/values.schema.json | 84 +++++++++++++++++++ charts/hive-metastore/values.yaml | 15 ++++ charts/jupyter/Chart.yaml | 2 +- charts/jupyter/values.schema.json | 15 +++- 6 files changed, 158 insertions(+), 4 deletions(-) diff --git a/charts/hive-metastore/Chart.yaml b/charts/hive-metastore/Chart.yaml index ca0077a7..fe4da7ba 100644 --- 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 index a0df932f..62577f5e 100644 --- a/charts/hive-metastore/templates/configmap.yaml +++ b/charts/hive-metastore/templates/configmap.yaml @@ -29,7 +29,49 @@ data: hive.metastore.warehouse.dir {{ .Values.service.warehouseDir}} - + {{- if .Values.security.networkPolicy.enable }} + + fs.s3a.connection.ssl.enabled + true + Enables or disables SSL connections to S3. + + + + fs.s3a.endpoint + 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. + + {{ .Values.s3.endpoint }} + + + fs.s3a.path.style.access + true + 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. + + + + + fs.s3a.aws.credentials.provider + org.apache.hadoop.fs.s3a.TemporaryAWSCredentialsProvider + + + + fs.s3a.access.key + {{ .Values.s3.accessKeyId }} + + + + fs.s3a.secret.key + {{ .Values.s3.secretAccessKey }} + + + + fs.s3a.session.token + {{ .Values.s3.sessionToken }} + + {{- end }} \ No newline at end of file diff --git a/charts/hive-metastore/values.schema.json b/charts/hive-metastore/values.schema.json index 3bd4b10f..aa3647e2 100644 --- 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 index d9eb29e6..91df9bca 100644 --- 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 index e42510e4..c731c27f 100644 --- 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 index 250e6e28..4812d0ec 100644 --- 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": {