From 402072d6bc1e858b2a329708ec5ddcd7f75a50e8 Mon Sep 17 00:00:00 2001
From: btx <48748248+benjamin-texier@users.noreply.github.com>
Date: Thu, 28 Apr 2022 18:38:12 +0200
Subject: [PATCH] fix(helm): fix postgresql values (#19835)

Signed-off-by: Benjamin Texier <benjamin.texier@outlook.com>
---
 helm/superset/Chart.yaml         |    2 +-
 helm/superset/values.schema.json | 1050 ++++++++++++++++--------------
 helm/superset/values.yaml        |   67 +-
 3 files changed, 584 insertions(+), 535 deletions(-)

diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml
index 2ac78630149b5..8d93ab473195b 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 17dac8e7ee01e..5e419d35a67d7 100644
--- a/helm/superset/values.schema.json
+++ b/helm/superset/values.schema.json
@@ -1,546 +1,598 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "type": "object",
-  "additionalProperties": true,
-  "properties": {
-    "replicaCount": {
-      "type": "integer"
-    },
-    "runAsUser": {
-      "type": "integer"
-    },
-    "serviceAccount": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "create": {
-          "type": "boolean"
-        }
-      },
-      "required": ["create"]
-    },
-    "bootstrapScript": {
-      "type": "string"
-    },
-    "configFromSecret": {
-      "type": "string"
-    },
-    "envFromSecret": {
-      "type": "string"
-    },
-    "envFromSecrets": {
-      "type": "array"
-    },
-    "extraEnv": {
-      "type": "object"
-    },
-    "extraEnvRaw": {
-      "type": "array"
-    },
-    "extraSecretEnv": {
-      "type": "object"
-    },
-    "extraConfigs": {
-      "type": "object"
-    },
-    "extraSecrets": {
-      "type": "object"
-    },
-    "extraVolumes": {
-      "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.apps.v1.PodSpec/properties/volumes"
-    },
-    "extraVolumeMounts": {
-      "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.apps.v1.PodSpec/properties/volumeMounts"
-    },
-    "configOverrides": {
-      "type": "object",
-      "additionalProperties": {
-        "type": "string"
-      },
-      "properties": {
-        "extend_timeout": {
-          "type": "string"
-        },
-        "enable_oauth": {
-          "type": "string"
-        }
-      }
-    },
-    "configOverridesFiles": {
-      "type": "object",
-      "additionalProperties": {
-        "type": "string"
-      },
-      "properties": {
-        "extend_timeout": {
-          "type": "string"
-        },
-        "enable_oauth": {
-          "type": "string"
-        }
-      }
-    },
-    "configMountPath": {
-      "type": "string"
-    },
-    "extraConfigMountPath": {
-      "type": "string"
-    },
-    "image": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "repository": {
-          "type": "string"
-        },
-        "tag": {
-          "type": "string"
-        },
-        "pullPolicy": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.Container/properties/imagePullPolicy"
-        }
-      },
-      "required": ["repository", "tag", "pullPolicy"]
-    },
-    "imagePullSecrets": {
-      "type": "array"
-    },
-    "initImage": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "repository": {
-          "type": "string"
-        },
-        "tag": {
-          "type": "string"
-        },
-        "pullPolicy": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.Container/properties/imagePullPolicy"
-        }
-      },
-      "required": ["repository", "tag", "pullPolicy"]
-    },
-    "service": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "type": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.ServiceSpec/properties/type"
-        },
-        "port": {
-          "type": "integer"
-        },
-        "annotations": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
-        },
-        "loadBalancerIP": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.ServiceSpec/properties/loadBalancerIP"
-        }
-      },
-      "required": ["type", "port"]
-    },
-    "ingress": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "enabled": {
-          "type": "boolean"
-        },
-        "annotations": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
-        },
-        "path": {
-          "type": "string"
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "type": "object",
+    "additionalProperties": true,
+    "properties": {
+        "replicaCount": {
+            "type": "integer"
         },
-        "pathType": {
-          "type": "string"
-        },
-        "ingressClassName": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.networking.v1.IngressSpec/properties/ingressClassName"
-        },
-        "hosts": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
+        "runAsUser": {
+            "type": "integer"
         },
-        "tls": {
-          "type": "array",
-          "items": {
+        "serviceAccount": {
             "type": "object",
             "additionalProperties": false,
             "properties": {
-              "secretName": {
-                "type": "string"
-              },
-              "hosts": {
-                "type": "array",
-                "items": {
-                  "type": "string"
+                "create": {
+                    "type": "boolean"
                 }
-              }
-            }
-          }
-        }
-      },
-      "required": ["enabled", "annotations", "path", "pathType", "hosts", "tls"]
-    },
-    "resources": {
-      "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.Container/properties/resources"
-    },
-    "hostAliases": {
-      "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.PodSpec/properties/hostAliases"
-    },
-    "supersetNode": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "command": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.Container/properties/command"
-        },
-        "connections": {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "redis_host": {
-              "type": "string"
-            },
-            "redis_password": {
-              "type": "string"
-            },
-            "redis_port": {
-              "type": "string"
-            },
-            "db_host": {
-              "type": "string"
-            },
-            "db_port": {
-              "type": "string"
-            },
-            "db_user": {
-              "type": "string"
-            },
-            "db_pass": {
-              "type": "string"
             },
-            "db_name": {
-              "type": "string"
-            }
-          },
-          "required": [
-            "redis_host",
-            "redis_port",
-            "db_host",
-            "db_port",
-            "db_user",
-            "db_pass",
-            "db_name"
-          ]
-        },
-        "env": {
-          "type": "object"
-        },
-        "forceReload": {
-          "type": "boolean"
-        },
-        "initContainers": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.PodSpec/properties/initContainers"
-        },
-        "deploymentAnnotations": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
-        },
-        "podAnnotations": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
-        },
-        "podLabels": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/labels"
-        }
-      },
-      "required": ["command", "connections", "env", "forceReload"]
-    },
-    "supersetWorker": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "command": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.Container/properties/command"
-        },
-        "forceReload": {
-          "type": "boolean"
-        },
-        "initContainers": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.PodSpec/properties/initContainers"
-        },
-        "deploymentAnnotations": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
+            "required": [
+                "create"
+            ]
         },
-        "podAnnotations": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
-        },
-        "podLabels": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/labels"
-        }
-      },
-      "required": ["command", "forceReload"]
-    },
-    "supersetCeleryBeat": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "enabled": {
-          "type": "boolean"
+        "bootstrapScript": {
+            "type": "string"
         },
-        "command": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.Container/properties/command"
+        "configFromSecret": {
+            "type": "string"
         },
-        "forceReload": {
-          "type": "boolean"
+        "envFromSecret": {
+            "type": "string"
         },
-        "initContainers": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.PodSpec/properties/initContainers"
+        "envFromSecrets": {
+            "type": "array"
         },
-        "deploymentAnnotations": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
+        "extraEnv": {
+            "type": "object"
         },
-        "podAnnotations": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
+        "extraEnvRaw": {
+            "type": "array"
         },
-        "podLabels": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/labels"
-        }
-      },
-      "required": ["enabled", "command", "forceReload"]
-    },
-    "init": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "resources": {
-          "type": "object"
+        "extraSecretEnv": {
+            "type": "object"
         },
-        "command": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.Container/properties/command"
+        "extraConfigs": {
+            "type": "object"
         },
-        "enabled": {
-          "type": "boolean"
+        "extraSecrets": {
+            "type": "object"
         },
-        "loadExamples": {
-          "type": "boolean"
+        "extraVolumes": {
+            "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.apps.v1.PodSpec/properties/volumes"
         },
-        "createAdmin": {
-          "type": "boolean"
+        "extraVolumeMounts": {
+            "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.apps.v1.PodSpec/properties/volumeMounts"
         },
-        "adminUser": {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "username": {
-              "type": "string"
-            },
-            "firstname": {
-              "type": "string"
-            },
-            "lastname": {
-              "type": "string"
+        "configOverrides": {
+            "type": "object",
+            "additionalProperties": {
+                "type": "string"
             },
-            "email": {
-              "type": "string"
+            "properties": {
+                "extend_timeout": {
+                    "type": "string"
+                },
+                "enable_oauth": {
+                    "type": "string"
+                }
+            }
+        },
+        "configOverridesFiles": {
+            "type": "object",
+            "additionalProperties": {
+                "type": "string"
             },
-            "password": {
-              "type": "string"
+            "properties": {
+                "extend_timeout": {
+                    "type": "string"
+                },
+                "enable_oauth": {
+                    "type": "string"
+                }
             }
-          },
-          "required": ["username", "firstname", "lastname", "email", "password"]
         },
-        "initContainers": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.PodSpec/properties/initContainers"
+        "configMountPath": {
+            "type": "string"
         },
-        "initscript": {
-          "type": "string"
+        "extraConfigMountPath": {
+            "type": "string"
         },
-        "podAnnotations": {
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
-        }
-      },
-      "required": [
-        "resources",
-        "command",
-        "enabled",
-        "loadExamples",
-        "createAdmin",
-        "adminUser",
-        "initscript"
-      ]
-    },
-    "postgresql": {
-      "type": "object",
-      "additionalProperties": true,
-      "properties": {
-        "enabled": {
-          "type": "boolean"
+        "image": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "repository": {
+                    "type": "string"
+                },
+                "tag": {
+                    "type": "string"
+                },
+                "pullPolicy": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.Container/properties/imagePullPolicy"
+                }
+            },
+            "required": [
+                "repository",
+                "tag",
+                "pullPolicy"
+            ]
         },
-        "existingSecret": {
-          "type": ["string", "null"]
+        "imagePullSecrets": {
+            "type": "array"
         },
-        "existingSecretKey": {
-          "type": ["string", "null"]
+        "initImage": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "repository": {
+                    "type": "string"
+                },
+                "tag": {
+                    "type": "string"
+                },
+                "pullPolicy": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.Container/properties/imagePullPolicy"
+                }
+            },
+            "required": [
+                "repository",
+                "tag",
+                "pullPolicy"
+            ]
         },
         "service": {
-          "type": "object",
-          "additionalProperties": true,
-          "properties": {
-            "port": {
-              "type": "integer"
-            }
-          },
-          "required": ["port"]
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "type": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.ServiceSpec/properties/type"
+                },
+                "port": {
+                    "type": "integer"
+                },
+                "annotations": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
+                },
+                "loadBalancerIP": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.ServiceSpec/properties/loadBalancerIP"
+                }
+            },
+            "required": [
+                "type",
+                "port"
+            ]
         },
-        "postgresqlUsername": {
-          "type": "string"
+        "ingress": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "enabled": {
+                    "type": "boolean"
+                },
+                "annotations": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
+                },
+                "path": {
+                    "type": "string"
+                },
+                "pathType": {
+                    "type": "string"
+                },
+                "ingressClassName": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.networking.v1.IngressSpec/properties/ingressClassName"
+                },
+                "hosts": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "tls": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "secretName": {
+                                "type": "string"
+                            },
+                            "hosts": {
+                                "type": "array",
+                                "items": {
+                                    "type": "string"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "required": [
+                "enabled",
+                "annotations",
+                "path",
+                "pathType",
+                "hosts",
+                "tls"
+            ]
         },
-        "postgresqlPassword": {
-          "type": "string"
+        "resources": {
+            "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.Container/properties/resources"
         },
-        "postgresqlDatabase": {
-          "type": "string"
+        "hostAliases": {
+            "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.PodSpec/properties/hostAliases"
         },
-        "persistence": {
-          "type": "object",
-          "additionalProperties": true,
-          "properties": {
-            "enabled": {
-              "type": "boolean"
+        "supersetNode": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "command": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.Container/properties/command"
+                },
+                "connections": {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "properties": {
+                        "redis_host": {
+                            "type": "string"
+                        },
+                        "redis_password": {
+                            "type": "string"
+                        },
+                        "redis_port": {
+                            "type": "string"
+                        },
+                        "db_host": {
+                            "type": "string"
+                        },
+                        "db_port": {
+                            "type": "string"
+                        },
+                        "db_user": {
+                            "type": "string"
+                        },
+                        "db_pass": {
+                            "type": "string"
+                        },
+                        "db_name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "redis_host",
+                        "redis_port",
+                        "db_host",
+                        "db_port",
+                        "db_user",
+                        "db_pass",
+                        "db_name"
+                    ]
+                },
+                "env": {
+                    "type": "object"
+                },
+                "forceReload": {
+                    "type": "boolean"
+                },
+                "initContainers": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.PodSpec/properties/initContainers"
+                },
+                "deploymentAnnotations": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
+                },
+                "podAnnotations": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
+                },
+                "podLabels": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/labels"
+                }
             },
-            "accessModes": {
-              "type": "array",
-              "items": [
-                {
-                  "type": "string"
+            "required": [
+                "command",
+                "connections",
+                "env",
+                "forceReload"
+            ]
+        },
+        "supersetWorker": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "command": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.Container/properties/command"
+                },
+                "forceReload": {
+                    "type": "boolean"
+                },
+                "initContainers": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.PodSpec/properties/initContainers"
+                },
+                "deploymentAnnotations": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
+                },
+                "podAnnotations": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
+                },
+                "podLabels": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/labels"
                 }
-              ]
-            }
-          },
-          "required": ["enabled", "accessModes"]
-        }
-      },
-      "required": [
-        "enabled",
-        "service",
-        "postgresqlUsername",
-        "postgresqlDatabase",
-        "persistence"
-      ]
-    },
-    "redis": {
-      "type": "object",
-      "additionalProperties": true,
-      "properties": {
-        "enabled": {
-          "type": "boolean"
-        },
-        "architecture": {
-          "type": "string"
-        },
-        "auth": {
-          "type": "object",
-          "properties": {
-            "enabled": {
-              "type": "boolean"
             },
-            "existingSecret": {
-              "type": "string"
+            "required": [
+                "command",
+                "forceReload"
+            ]
+        },
+        "supersetCeleryBeat": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "enabled": {
+                    "type": "boolean"
+                },
+                "command": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.Container/properties/command"
+                },
+                "forceReload": {
+                    "type": "boolean"
+                },
+                "initContainers": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.PodSpec/properties/initContainers"
+                },
+                "deploymentAnnotations": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
+                },
+                "podAnnotations": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
+                },
+                "podLabels": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/labels"
+                }
             },
-            "existingSecretKey": {
-              "type": "string"
+            "required": [
+                "enabled",
+                "command",
+                "forceReload"
+            ]
+        },
+        "init": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "resources": {
+                    "type": "object"
+                },
+                "command": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.Container/properties/command"
+                },
+                "enabled": {
+                    "type": "boolean"
+                },
+                "loadExamples": {
+                    "type": "boolean"
+                },
+                "createAdmin": {
+                    "type": "boolean"
+                },
+                "adminUser": {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "properties": {
+                        "username": {
+                            "type": "string"
+                        },
+                        "firstname": {
+                            "type": "string"
+                        },
+                        "lastname": {
+                            "type": "string"
+                        },
+                        "email": {
+                            "type": "string"
+                        },
+                        "password": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "username",
+                        "firstname",
+                        "lastname",
+                        "email",
+                        "password"
+                    ]
+                },
+                "initContainers": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.core.v1.PodSpec/properties/initContainers"
+                },
+                "initscript": {
+                    "type": "string"
+                },
+                "podAnnotations": {
+                    "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
+                }
             },
-            "password": {
-              "type": "string"
-            }
-          },
-          "required": ["enabled"]
-        },
-        "master": {
-          "type": "object",
-          "additionalProperties": true,
-          "properties": {
-            "persistence": {
-              "type": "object",
-              "additionalProperties": true,
-              "properties": {
+            "required": [
+                "resources",
+                "command",
+                "enabled",
+                "loadExamples",
+                "createAdmin",
+                "adminUser",
+                "initscript"
+            ]
+        },
+        "postgresql": {
+            "type": "object",
+            "properties": {
+                "auth": {
+                    "type": "object",
+                    "properties": {
+                        "database": {
+                            "type": "string"
+                        },
+                        "existingSecret": {
+                            "type": [
+                              "string",
+                              "null"
+                            ]
+                        },
+                        "password": {
+                            "type": "string"
+                        },
+                        "username": {
+                            "type": "string"
+                        }
+                    }
+                },
                 "enabled": {
-                  "type": "boolean"
+                    "type": "boolean"
                 },
-                "accessModes": {
-                  "type": "array",
-                  "items": [
-                    {
-                      "type": "string"
+                "primary": {
+                    "type": "object",
+                    "properties": {
+                        "persistence": {
+                            "type": "object",
+                            "properties": {
+                                "accessModes": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "string"
+                                    }
+                                },
+                                "enabled": {
+                                    "type": "boolean"
+                                }
+                            }
+                        },
+                        "service": {
+                            "type": "object",
+                            "properties": {
+                                "ports": {
+                                    "type": "object",
+                                    "properties": {
+                                        "postgresql": {
+                                            "type": "string"
+                                        }
+                                    }
+                                }
+                            }
+                        }
                     }
-                  ]
                 }
-              },
-              "required": ["enabled", "accessModes"]
             }
-          },
-          "required": ["persistence"]
-        },
-        "cluster": {
-          "type": "object",
-          "additionalProperties": true,
-          "properties": {
-            "enabled": {
-              "type": "boolean"
-            }
-          },
-          "required": ["enabled"]
+        },
+        "redis": {
+            "type": "object",
+            "additionalProperties": true,
+            "properties": {
+                "enabled": {
+                    "type": "boolean"
+                },
+                "architecture": {
+                    "type": "string"
+                },
+                "auth": {
+                    "type": "object",
+                    "properties": {
+                        "enabled": {
+                            "type": "boolean"
+                        },
+                        "existingSecret": {
+                            "type": "string"
+                        },
+                        "existingSecretKey": {
+                            "type": "string"
+                        },
+                        "password": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "enabled"
+                    ]
+                },
+                "master": {
+                    "type": "object",
+                    "additionalProperties": true,
+                    "properties": {
+                        "persistence": {
+                            "type": "object",
+                            "additionalProperties": true,
+                            "properties": {
+                                "enabled": {
+                                    "type": "boolean"
+                                },
+                                "accessModes": {
+                                    "type": "array",
+                                    "items": [
+                                        {
+                                            "type": "string"
+                                        }
+                                    ]
+                                }
+                            },
+                            "required": [
+                                "enabled",
+                                "accessModes"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "persistence"
+                    ]
+                },
+                "cluster": {
+                    "type": "object",
+                    "additionalProperties": true,
+                    "properties": {
+                        "enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "enabled"
+                    ]
+                }
+            },
+            "required": [
+                "enabled",
+                "architecture",
+                "master"
+            ]
+        },
+        "nodeSelector": {
+            "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.apps.v1.PodSpec/properties/nodeSelector"
+        },
+        "tolerations": {
+            "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.apps.v1.PodSpec/properties/tolerations"
+        },
+        "affinity": {
+            "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json#/definitions/io.k8s.api.core.v1.Affinity"
         }
-      },
-      "required": ["enabled", "architecture", "master"]
-    },
-    "nodeSelector": {
-      "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.apps.v1.PodSpec/properties/nodeSelector"
     },
-    "tolerations": {
-      "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json##/definitions/io.k8s.api.apps.v1.PodSpec/properties/tolerations"
-    },
-    "affinity": {
-      "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0/_definitions.json#/definitions/io.k8s.api.core.v1.Affinity"
-    }
-  },
-  "required": [
-    "replicaCount",
-    "runAsUser",
-    "serviceAccount",
-    "bootstrapScript",
-    "configFromSecret",
-    "envFromSecret",
-    "envFromSecrets",
-    "extraEnv",
-    "extraEnvRaw",
-    "extraSecretEnv",
-    "extraConfigs",
-    "extraSecrets",
-    "extraVolumes",
-    "extraVolumeMounts",
-    "configOverrides",
-    "configOverridesFiles",
-    "configMountPath",
-    "extraConfigMountPath",
-    "image",
-    "imagePullSecrets",
-    "service",
-    "ingress",
-    "resources",
-    "hostAliases",
-    "supersetNode",
-    "supersetWorker",
-    "supersetCeleryBeat",
-    "init",
-    "postgresql",
-    "redis",
-    "nodeSelector",
-    "tolerations",
-    "affinity"
-  ]
+    "required": [
+        "replicaCount",
+        "runAsUser",
+        "serviceAccount",
+        "bootstrapScript",
+        "configFromSecret",
+        "envFromSecret",
+        "envFromSecrets",
+        "extraEnv",
+        "extraEnvRaw",
+        "extraSecretEnv",
+        "extraConfigs",
+        "extraSecrets",
+        "extraVolumes",
+        "extraVolumeMounts",
+        "configOverrides",
+        "configOverridesFiles",
+        "configMountPath",
+        "extraConfigMountPath",
+        "image",
+        "imagePullSecrets",
+        "service",
+        "ingress",
+        "resources",
+        "hostAliases",
+        "supersetNode",
+        "supersetWorker",
+        "supersetCeleryBeat",
+        "init",
+        "postgresql",
+        "redis",
+        "nodeSelector",
+        "tolerations",
+        "affinity"
+    ]
 }
diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml
index ea8472ebc31da..2adc6bf662944 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