You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by cr...@apache.org on 2022/04/28 16:38:21 UTC
[superset] branch master updated: fix(helm): fix postgresql values (#19835)
This is an automated email from the ASF dual-hosted git repository.
craigrueda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new f198f9f007 fix(helm): fix postgresql values (#19835)
f198f9f007 is described below
commit f198f9f007741d5098f176d770b1ab3245969332
Author: btx <48...@users.noreply.github.com>
AuthorDate: Thu Apr 28 18:38:12 2022 +0200
fix(helm): fix postgresql values (#19835)
Signed-off-by: Benjamin Texier <be...@outlook.com>
---
helm/superset/Chart.yaml | 2 +-
helm/superset/values.schema.json | 100 ++++++++++++++++++---------------------
helm/superset/values.yaml | 67 +++++++++++++-------------
3 files changed, 78 insertions(+), 91 deletions(-)
diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml
index 2ac7863014..8d93ab4731 100644
--- a/helm/superset/Chart.yaml
+++ b/helm/superset/Chart.yaml
@@ -22,7 +22,7 @@ maintainers:
- name: craig-rueda
email: craig@craigrueda.com
url: https://github.com/craig-rueda
-version: 0.6.0
+version: 0.6.1
dependencies:
- name: postgresql
version: 11.1.22
diff --git a/helm/superset/values.schema.json b/helm/superset/values.schema.json
index 2273718d7b..5e419d35a6 100644
--- a/helm/superset/values.schema.json
+++ b/helm/superset/values.schema.json
@@ -413,73 +413,63 @@
},
"postgresql": {
"type": "object",
- "additionalProperties": true,
"properties": {
- "enabled": {
- "type": "boolean"
- },
- "existingSecret": {
- "type": [
- "string",
- "null"
- ]
- },
- "existingSecretKey": {
- "type": [
- "string",
- "null"
- ]
- },
- "service": {
+ "auth": {
"type": "object",
- "additionalProperties": true,
"properties": {
- "port": {
- "type": "integer"
+ "database": {
+ "type": "string"
+ },
+ "existingSecret": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "password": {
+ "type": "string"
+ },
+ "username": {
+ "type": "string"
}
- },
- "required": [
- "port"
- ]
- },
- "postgresqlUsername": {
- "type": "string"
- },
- "postgresqlPassword": {
- "type": "string"
+ }
},
- "postgresqlDatabase": {
- "type": "string"
+ "enabled": {
+ "type": "boolean"
},
- "persistence": {
+ "primary": {
"type": "object",
- "additionalProperties": true,
"properties": {
- "enabled": {
- "type": "boolean"
+ "persistence": {
+ "type": "object",
+ "properties": {
+ "accessModes": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "enabled": {
+ "type": "boolean"
+ }
+ }
},
- "accessModes": {
- "type": "array",
- "items": [
- {
- "type": "string"
+ "service": {
+ "type": "object",
+ "properties": {
+ "ports": {
+ "type": "object",
+ "properties": {
+ "postgresql": {
+ "type": "string"
+ }
+ }
}
- ]
+ }
}
- },
- "required": [
- "enabled",
- "accessModes"
- ]
+ }
}
- },
- "required": [
- "enabled",
- "service",
- "postgresqlUsername",
- "postgresqlDatabase",
- "persistence"
- ]
+ }
},
"redis": {
"type": "object",
diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml
index ea8472ebc3..2adc6bf662 100644
--- a/helm/superset/values.yaml
+++ b/helm/superset/values.yaml
@@ -370,42 +370,39 @@ postgresql:
## Use the PostgreSQL chart dependency.
## Set to false if bringing your own PostgreSQL.
enabled: true
- ##
- ## The name of an existing secret that contains the postgres password.
- existingSecret:
- ## Name of the key containing the secret.
- existingSecretKey: postgresql-password
- ##
- ## If you are bringing your own PostgreSQL, you should set postgresHost and
- ## also probably service.port, postgresqlUsername, postgresqlPassword, and postgresqlDatabase
- ## postgresHost:
- ##
- ## PostgreSQL port
- service:
- port: 5432
- ## PostgreSQL User to create.
- postgresqlUsername: superset
- ##
- ## PostgreSQL Password for the new user.
- ## If not set, a random 10 characters password will be used.
- postgresqlPassword: superset
- ##
- ## PostgreSQL Database to create.
- postgresqlDatabase: superset
- ##
- ## Persistent Volume Storage configuration.
- ## ref: https://kubernetes.io/docs/user-guide/persistent-volumes
- persistence:
- ##
- ## Enable PostgreSQL persistence using Persistent Volume Claims.
- enabled: true
- ##
- ## Persistant class
- # storageClass: classname
+
+ ## Authentication parameters
+ auth:
+ ## The name of an existing secret that contains the postgres password.
+ existingSecret:
+ ## PostgreSQL name for a custom user to create
+ username: superset
+ ## PostgreSQL password for the custom user to create. Ignored if `auth.existingSecret` with key `password` is provided
+ password: superset
+ ## PostgreSQL name for a custom database to create
+ database: superset
+
+
+ ## PostgreSQL Primary parameters
+ primary:
##
- ## Access modes:
- accessModes:
- - ReadWriteOnce
+ ## Persistent Volume Storage configuration.
+ ## ref: https://kubernetes.io/docs/user-guide/persistent-volumes
+ persistence:
+ ##
+ ## Enable PostgreSQL persistence using Persistent Volume Claims.
+ enabled: true
+ ##
+ ## Persistant class
+ # storageClass: classname
+ ##
+ ## Access modes:
+ accessModes:
+ - ReadWriteOnce
+ ## PostgreSQL port
+ service:
+ ports:
+ postgresql: "5432"
## Configuration values for the Redis dependency.
## ref: https://github.com/bitnami/charts/blob/master/bitnami/redis