From 002f5bd59aa65bc339aa51c978aaa5f74d3fe0b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pedro=20Alc=C3=A2ntara?= <39736905+sule26@users.noreply.github.com> Date: Thu, 2 Jan 2025 16:03:06 -0300 Subject: [PATCH 1/8] Update values.yaml comments --- helm/superset/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml index eec82cf3488e5..61a4ecfcaf716 100644 --- a/helm/superset/values.yaml +++ b/helm/superset/values.yaml @@ -106,7 +106,7 @@ extraSecretEnv: {} # # Generate your own secret key for encryption. Use openssl rand -base64 42 to generate a good key # SUPERSET_SECRET_KEY: 'CHANGE_ME_TO_A_COMPLEX_RANDOM_SECRET' -# -- Extra files to mount on `/app/pythonpath` +# -- Extra files to mount on `/app/configs` extraConfigs: {} # import_datasources.yaml: | # databases: From 4a8cba0e60b9cd04c47b269a6d5a5c839979efab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pedro=20Alc=C3=A2ntara?= <39736905+sule26@users.noreply.github.com> Date: Thu, 2 Jan 2025 16:37:12 -0300 Subject: [PATCH 2/8] Bump chart version --- helm/superset/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml index 202480e475e80..09cb8ab7d2141 100644 --- a/helm/superset/Chart.yaml +++ b/helm/superset/Chart.yaml @@ -29,7 +29,7 @@ maintainers: - name: craig-rueda email: craig@craigrueda.com url: https://github.com/craig-rueda -version: 0.13.5 +version: 0.13.6 dependencies: - name: postgresql version: 12.1.6 From da4d2101b046dd8c32c2a00a4db1a2cd03c104f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pedro=20Alc=C3=A2ntara?= Date: Thu, 2 Jan 2025 17:14:14 -0300 Subject: [PATCH 3/8] docs: update readme with helm-docs --- helm/superset/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/superset/README.md b/helm/superset/README.md index acd2519c98600..91428ee8ce39f 100644 --- a/helm/superset/README.md +++ b/helm/superset/README.md @@ -23,7 +23,7 @@ NOTE: This file is generated by helm-docs: https://github.com/norwoodj/helm-docs # superset -![Version: 0.13.5](https://img.shields.io/badge/Version-0.13.5-informational?style=flat-square) +![Version: 0.13.6](https://img.shields.io/badge/Version-0.13.6-informational?style=flat-square) Apache Superset is a modern, enterprise-ready business intelligence web application @@ -66,7 +66,7 @@ On helm this can be set on `extraSecretEnv.SUPERSET_SECRET_KEY` or `configOverri | envFromSecret | string | `"{{ template \"superset.fullname\" . }}-env"` | The name of the secret which we will use to populate env vars in deployed pods This can be useful for secret keys, etc. | | envFromSecrets | list | `[]` | This can be a list of templated strings | | extraConfigMountPath | string | `"/app/configs"` | | -| extraConfigs | object | `{}` | Extra files to mount on `/app/pythonpath` | +| extraConfigs | object | `{}` | Extra files to mount on `/app/configs` | | extraEnv | object | `{}` | Extra environment variables that will be passed into pods | | extraEnvRaw | list | `[]` | Extra environment variables in RAW format that will be passed into pods | | extraLabels | object | `{}` | Labels to be added to all resources | From 7b973d61becf3fbff0c480faf10b50a2bca76307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pedro=20Alc=C3=A2ntara?= Date: Thu, 2 Jan 2025 17:53:28 -0300 Subject: [PATCH 4/8] docs: Clarify mount paths for extraSecrets and extraConfigs --- helm/superset/README.md | 8 +- helm/superset/values.yaml | 174 +++++++++++++++++++++----------------- 2 files changed, 101 insertions(+), 81 deletions(-) diff --git a/helm/superset/README.md b/helm/superset/README.md index 91428ee8ce39f..730c16d52c5fb 100644 --- a/helm/superset/README.md +++ b/helm/superset/README.md @@ -60,18 +60,18 @@ On helm this can be set on `extraSecretEnv.SUPERSET_SECRET_KEY` or `configOverri | affinity | object | `{}` | | | bootstrapScript | string | see `values.yaml` | Install additional packages and do any other bootstrap configuration in this script For production clusters it's recommended to build own image with this step done in CI | | configFromSecret | string | `"{{ template \"superset.fullname\" . }}-config"` | The name of the secret which we will use to generate a superset_config.py file Note: this secret must have the key superset_config.py in it and can include other files as well | -| configMountPath | string | `"/app/pythonpath"` | | +| configMountPath | string | `"/app/pythonpath"` | Define where configOverrides and extraSecrets are going to be mounted | | configOverrides | object | `{}` | A dictionary of overrides to append at the end of superset_config.py - the name does not matter WARNING: the order is not guaranteed Files can be passed as helm --set-file configOverrides.my-override=my-file.py | | configOverridesFiles | object | `{}` | Same as above but the values are files | | envFromSecret | string | `"{{ template \"superset.fullname\" . }}-env"` | The name of the secret which we will use to populate env vars in deployed pods This can be useful for secret keys, etc. | | envFromSecrets | list | `[]` | This can be a list of templated strings | -| extraConfigMountPath | string | `"/app/configs"` | | -| extraConfigs | object | `{}` | Extra files to mount on `/app/configs` | +| extraConfigMountPath | string | `"/app/configs"` | Define where extraConfigs is going to be mounted | +| extraConfigs | object | `{}` | Extra files to be mount as ConfigMap on the path specified in `extraConfigMountPath` | | extraEnv | object | `{}` | Extra environment variables that will be passed into pods | | extraEnvRaw | list | `[]` | Extra environment variables in RAW format that will be passed into pods | | extraLabels | object | `{}` | Labels to be added to all resources | | extraSecretEnv | object | `{}` | Extra environment variables to pass as secrets | -| extraSecrets | object | `{}` | Extra files to mount on `/app/pythonpath` as secrets | +| extraSecrets | object | `{}` | Extra files to be mount as Secrets on the path specified in `configMountPath` | | extraVolumeMounts | list | `[]` | | | extraVolumes | list | `[]` | | | fullnameOverride | string | `nil` | Provide a name to override the full names of resources | diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml index 61a4ecfcaf716..f4d4cc87fe8ed 100644 --- a/helm/superset/values.yaml +++ b/helm/superset/values.yaml @@ -66,7 +66,8 @@ envFromSecret: '{{ template "superset.fullname" . }}-env' envFromSecrets: [] # -- Extra environment variables that will be passed into pods -extraEnv: {} +extraEnv: + {} # Different gunicorn settings, refer to the gunicorn documentation # https://docs.gunicorn.org/en/stable/settings.html# # These variables are used as Flags at the gunicorn startup @@ -89,7 +90,8 @@ extraEnv: {} # OAUTH_WHITELIST_REGEX: ... # -- Extra environment variables in RAW format that will be passed into pods -extraEnvRaw: [] +extraEnvRaw: + [] # Load DB password from other secret (e.g. for zalando operator) # - name: DB_PASS # valueFrom: @@ -98,7 +100,8 @@ extraEnvRaw: [] # key: password # -- Extra environment variables to pass as secrets -extraSecretEnv: {} +extraSecretEnv: + {} # MAPBOX_API_KEY: ... # # Google API Keys: https://console.cloud.google.com/apis/credentials # GOOGLE_KEY: ... @@ -106,8 +109,9 @@ extraSecretEnv: {} # # Generate your own secret key for encryption. Use openssl rand -base64 42 to generate a good key # SUPERSET_SECRET_KEY: 'CHANGE_ME_TO_A_COMPLEX_RANDOM_SECRET' -# -- Extra files to mount on `/app/configs` -extraConfigs: {} +# -- Extra files to be mount as ConfigMap on the path specified in `extraConfigMountPath` +extraConfigs: + {} # import_datasources.yaml: | # databases: # - allow_file_upload: true @@ -120,10 +124,11 @@ extraConfigs: {} # sqlalchemy_uri: example://example-db.local # tables: [] -# -- Extra files to mount on `/app/pythonpath` as secrets +# -- Extra files to be mount as Secrets on the path specified in `configMountPath` extraSecrets: {} -extraVolumes: [] +extraVolumes: + [] # - name: customConfig # configMap: # name: '{{ template "superset.fullname" . }}-custom-config' @@ -132,7 +137,8 @@ extraVolumes: [] # secretName: my-secret # defaultMode: 0600 -extraVolumeMounts: [] +extraVolumeMounts: + [] # - name: customConfig # mountPath: /mnt/config # readOnly: true @@ -142,7 +148,8 @@ extraVolumeMounts: [] # -- A dictionary of overrides to append at the end of superset_config.py - the name does not matter # WARNING: the order is not guaranteed # Files can be passed as helm --set-file configOverrides.my-override=my-file.py -configOverrides: {} +configOverrides: + {} # extend_timeout: | # # Extend timeout to allow long running queries. # SUPERSET_WEBSERVER_TIMEOUT = ... @@ -179,13 +186,16 @@ configOverrides: {} # SECRET_KEY = 'CHANGE_ME_TO_A_COMPLEX_RANDOM_SECRET' # -- Same as above but the values are files -configOverridesFiles: {} +configOverridesFiles: + {} # extend_timeout: extend_timeout.py # enable_oauth: enable_oauth.py -configMountPath: "/app/pythonpath" +# -- Define where configOverrides and extraSecrets are going to be mounted +configMountPath: '/app/pythonpath' -extraConfigMountPath: "/app/configs" +# -- Define where extraConfigs is going to be mounted +extraConfigMountPath: '/app/configs' image: repository: apachesuperset.docker.scarf.sh/apache/superset @@ -202,7 +212,8 @@ initImage: service: type: ClusterIP port: 8088 - annotations: {} + annotations: + {} # cloud.google.com/load-balancer-type: "Internal" loadBalancerIP: ~ nodePort: @@ -212,7 +223,8 @@ service: ingress: enabled: false ingressClassName: ~ - annotations: {} + annotations: + {} # kubernetes.io/tls-acme: "true" ## Extend timeout to allow long running queries. # nginx.ingress.kubernetes.io/proxy-connect-timeout: "300" @@ -228,7 +240,8 @@ ingress: # hosts: # - chart-example.local -resources: {} +resources: + {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following @@ -272,17 +285,17 @@ supersetNode: # -- Startup command # @default -- See `values.yaml` command: - - "/bin/sh" - - "-c" - - ". {{ .Values.configMountPath }}/superset_bootstrap.sh; /usr/bin/run-server.sh" + - '/bin/sh' + - '-c' + - '. {{ .Values.configMountPath }}/superset_bootstrap.sh; /usr/bin/run-server.sh' connections: # -- Change in case of bringing your own redis and then also set redis.enabled:false redis_host: '{{ .Release.Name }}-redis-headless' - redis_port: "6379" - redis_user: "" + redis_port: '6379' + redis_user: '' # redis_password: superset - redis_cache_db: "1" - redis_celery_db: "0" + redis_cache_db: '1' + redis_celery_db: '0' # Or SSL port is usually 6380 # Update following for using Redis with SSL redis_ssl: @@ -290,7 +303,7 @@ supersetNode: ssl_cert_reqs: CERT_NONE # You need to change below configuration incase bringing own PostgresSQL instance and also set postgresql.enabled:false db_host: '{{ .Release.Name }}-postgresql' - db_port: "5432" + db_port: '5432' db_user: superset db_pass: superset db_name: superset @@ -301,11 +314,11 @@ supersetNode: # @default -- a container waiting for postgres initContainers: - name: wait-for-postgres - image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}" - imagePullPolicy: "{{ .Values.initImage.pullPolicy }}" + image: '{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}' + imagePullPolicy: '{{ .Values.initImage.pullPolicy }}' envFrom: - secretRef: - name: "{{ tpl .Values.envFromSecret . }}" + name: '{{ tpl .Values.envFromSecret . }}' command: - /bin/sh - -c @@ -353,7 +366,8 @@ supersetNode: periodSeconds: 15 successThreshold: 1 # -- Resource settings for the supersetNode pods - these settings overwrite might existing values from the global resources object defined above. - resources: {} + resources: + {} # limits: # cpu: 100m # memory: 128Mi @@ -362,7 +376,8 @@ supersetNode: # memory: 128Mi podSecurityContext: {} containerSecurityContext: {} - strategy: {} + strategy: + {} # type: RollingUpdate # rollingUpdate: # maxSurge: 25% @@ -390,20 +405,20 @@ supersetWorker: # -- Worker startup command # @default -- a `celery worker` command command: - - "/bin/sh" - - "-c" - - ". {{ .Values.configMountPath }}/superset_bootstrap.sh; celery --app=superset.tasks.celery_app:app worker" + - '/bin/sh' + - '-c' + - '. {{ .Values.configMountPath }}/superset_bootstrap.sh; celery --app=superset.tasks.celery_app:app worker' # -- If true, forces deployment to reload on each upgrade forceReload: false # -- Init container # @default -- a container waiting for postgres and redis initContainers: - name: wait-for-postgres-redis - image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}" - imagePullPolicy: "{{ .Values.initImage.pullPolicy }}" + image: '{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}' + imagePullPolicy: '{{ .Values.initImage.pullPolicy }}' envFrom: - secretRef: - name: "{{ tpl .Values.envFromSecret . }}" + name: '{{ tpl .Values.envFromSecret . }}' command: - /bin/sh - -c @@ -423,7 +438,8 @@ supersetWorker: # -- Labels to be added to supersetWorker pods podLabels: {} # -- Resource settings for the supersetWorker pods - these settings overwrite might existing values from the global resources object defined above. - resources: {} + resources: + {} # limits: # cpu: 100m # memory: 128Mi @@ -432,7 +448,8 @@ supersetWorker: # memory: 128Mi podSecurityContext: {} containerSecurityContext: {} - strategy: {} + strategy: + {} # type: RollingUpdate # rollingUpdate: # maxSurge: 25% @@ -472,20 +489,20 @@ supersetCeleryBeat: # -- Command # @default -- a `celery beat` command command: - - "/bin/sh" - - "-c" - - ". {{ .Values.configMountPath }}/superset_bootstrap.sh; celery --app=superset.tasks.celery_app:app beat --pidfile /tmp/celerybeat.pid --schedule /tmp/celerybeat-schedule" + - '/bin/sh' + - '-c' + - '. {{ .Values.configMountPath }}/superset_bootstrap.sh; celery --app=superset.tasks.celery_app:app beat --pidfile /tmp/celerybeat.pid --schedule /tmp/celerybeat-schedule' # -- If true, forces deployment to reload on each upgrade forceReload: false # -- List of init containers # @default -- a container waiting for postgres initContainers: - name: wait-for-postgres-redis - image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}" - imagePullPolicy: "{{ .Values.initImage.pullPolicy }}" + image: '{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}' + imagePullPolicy: '{{ .Values.initImage.pullPolicy }}' envFrom: - secretRef: - name: "{{ tpl .Values.envFromSecret . }}" + name: '{{ tpl .Values.envFromSecret . }}' command: - /bin/sh - -c @@ -503,7 +520,8 @@ supersetCeleryBeat: # -- Labels to be added to supersetCeleryBeat pods podLabels: {} # -- Resource settings for the CeleryBeat pods - these settings overwrite might existing values from the global resources object defined above. - resources: {} + resources: + {} # limits: # cpu: 100m # memory: 128Mi @@ -532,9 +550,9 @@ supersetCeleryFlower: # -- Command # @default -- a `celery flower` command command: - - "/bin/sh" - - "-c" - - "celery --app=superset.tasks.celery_app:app flower" + - '/bin/sh' + - '-c' + - 'celery --app=superset.tasks.celery_app:app flower' service: type: ClusterIP annotations: {} @@ -574,11 +592,11 @@ supersetCeleryFlower: # @default -- a container waiting for postgres and redis initContainers: - name: wait-for-postgres-redis - image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}" - imagePullPolicy: "{{ .Values.initImage.pullPolicy }}" + image: '{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}' + imagePullPolicy: '{{ .Values.initImage.pullPolicy }}' envFrom: - secretRef: - name: "{{ tpl .Values.envFromSecret . }}" + name: '{{ tpl .Values.envFromSecret . }}' command: - /bin/sh - -c @@ -596,7 +614,8 @@ supersetCeleryFlower: # -- Labels to be added to supersetCeleryFlower pods podLabels: {} # -- Resource settings for the CeleryBeat pods - these settings overwrite might existing values from the global resources object defined above. - resources: {} + resources: + {} # limits: # cpu: 100m # memory: 128Mi @@ -634,22 +653,22 @@ supersetWebsockets: # @default -- see `values.yaml` config: { - "port": 8080, - "logLevel": "debug", - "logToFile": false, - "logFilename": "app.log", - "statsd": { "host": "127.0.0.1", "port": 8125, "globalTags": [] }, - "redis": + 'port': 8080, + 'logLevel': 'debug', + 'logToFile': false, + 'logFilename': 'app.log', + 'statsd': { 'host': '127.0.0.1', 'port': 8125, 'globalTags': [] }, + 'redis': { - "port": 6379, - "host": "127.0.0.1", - "password": "", - "db": 0, - "ssl": false, + 'port': 6379, + 'host': '127.0.0.1', + 'password': '', + 'db': 0, + 'ssl': false, }, - "redisStreamPrefix": "async-events-", - "jwtSecret": "CHANGE-ME", - "jwtCookieName": "async-token", + 'redisStreamPrefix': 'async-events-', + 'jwtSecret': 'CHANGE-ME', + 'jwtCookieName': 'async-token', } service: type: ClusterIP @@ -709,7 +728,8 @@ init: # cause the process to be killed due to OOM if it exceeds limit # Make sure you are giving a strong password for the admin user creation( else make sure you are changing after setup) # Also change the admin email to your own custom email. - resources: {} + resources: + {} # limits: # cpu: # memory: @@ -719,13 +739,13 @@ init: # -- Command # @default -- a `superset_init.sh` command command: - - "/bin/sh" - - "-c" - - ". {{ .Values.configMountPath }}/superset_bootstrap.sh; . {{ .Values.configMountPath }}/superset_init.sh" + - '/bin/sh' + - '-c' + - '. {{ .Values.configMountPath }}/superset_bootstrap.sh; . {{ .Values.configMountPath }}/superset_init.sh' enabled: true jobAnnotations: - "helm.sh/hook": post-install,post-upgrade - "helm.sh/hook-delete-policy": "before-hook-creation" + 'helm.sh/hook': post-install,post-upgrade + 'helm.sh/hook-delete-policy': 'before-hook-creation' loadExamples: false createAdmin: true adminUser: @@ -738,11 +758,11 @@ init: # @default -- a container waiting for postgres initContainers: - name: wait-for-postgres - image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}" - imagePullPolicy: "{{ .Values.initImage.pullPolicy }}" + image: '{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}' + imagePullPolicy: '{{ .Values.initImage.pullPolicy }}' envFrom: - secretRef: - name: "{{ tpl .Values.envFromSecret . }}" + name: '{{ tpl .Values.envFromSecret . }}' command: - /bin/sh - -c @@ -812,7 +832,7 @@ postgresql: database: superset image: - tag: "14.6.0-debian-11-r13" + tag: '14.6.0-debian-11-r13' ## PostgreSQL Primary parameters primary: @@ -833,7 +853,7 @@ postgresql: ## PostgreSQL port service: ports: - postgresql: "5432" + postgresql: '5432' # -- Configuration values for the Redis dependency. # ref: https://github.com/bitnami/charts/blob/master/bitnami/redis @@ -857,9 +877,9 @@ redis: ## Enable password authentication enabled: false ## The name of an existing secret that contains the redis password. - existingSecret: "" + existingSecret: '' ## Name of the key containing the secret. - existingSecretKey: "" + existingSecretKey: '' ## Redis password password: superset ## From 098c12d2419ab97c9ef2846d0cde97854a2c7af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pedro=20Alc=C3=A2ntara?= Date: Thu, 2 Jan 2025 18:16:07 -0300 Subject: [PATCH 5/8] docs: fix typo --- helm/superset/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml index f4d4cc87fe8ed..c427fb64cc45a 100644 --- a/helm/superset/values.yaml +++ b/helm/superset/values.yaml @@ -109,7 +109,7 @@ extraSecretEnv: # # Generate your own secret key for encryption. Use openssl rand -base64 42 to generate a good key # SUPERSET_SECRET_KEY: 'CHANGE_ME_TO_A_COMPLEX_RANDOM_SECRET' -# -- Extra files to be mount as ConfigMap on the path specified in `extraConfigMountPath` +# -- Extra files to be mounted as ConfigMap on the path specified in `extraConfigMountPath` extraConfigs: {} # import_datasources.yaml: | @@ -124,7 +124,7 @@ extraConfigs: # sqlalchemy_uri: example://example-db.local # tables: [] -# -- Extra files to be mount as Secrets on the path specified in `configMountPath` +# -- Extra files to be mounted as Secrets on the path specified in `configMountPath` extraSecrets: {} extraVolumes: From 003637b803fd9e0dbdd816d16c22e44d8e4f1aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pedro=20Alc=C3=A2ntara?= Date: Thu, 2 Jan 2025 18:24:54 -0300 Subject: [PATCH 6/8] fixup! docs: fix typo --- helm/superset/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/superset/README.md b/helm/superset/README.md index 730c16d52c5fb..cd187a17d1310 100644 --- a/helm/superset/README.md +++ b/helm/superset/README.md @@ -66,12 +66,12 @@ On helm this can be set on `extraSecretEnv.SUPERSET_SECRET_KEY` or `configOverri | envFromSecret | string | `"{{ template \"superset.fullname\" . }}-env"` | The name of the secret which we will use to populate env vars in deployed pods This can be useful for secret keys, etc. | | envFromSecrets | list | `[]` | This can be a list of templated strings | | extraConfigMountPath | string | `"/app/configs"` | Define where extraConfigs is going to be mounted | -| extraConfigs | object | `{}` | Extra files to be mount as ConfigMap on the path specified in `extraConfigMountPath` | +| extraConfigs | object | `{}` | Extra files to be mounted as ConfigMap on the path specified in `extraConfigMountPath` | | extraEnv | object | `{}` | Extra environment variables that will be passed into pods | | extraEnvRaw | list | `[]` | Extra environment variables in RAW format that will be passed into pods | | extraLabels | object | `{}` | Labels to be added to all resources | | extraSecretEnv | object | `{}` | Extra environment variables to pass as secrets | -| extraSecrets | object | `{}` | Extra files to be mount as Secrets on the path specified in `configMountPath` | +| extraSecrets | object | `{}` | Extra files to be mounted as Secrets on the path specified in `configMountPath` | | extraVolumeMounts | list | `[]` | | | extraVolumes | list | `[]` | | | fullnameOverride | string | `nil` | Provide a name to override the full names of resources | From 11fc493ae31682d2b86a2340c4bd8f09f1cb32b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pedro=20Alc=C3=A2ntara?= Date: Thu, 2 Jan 2025 18:37:04 -0300 Subject: [PATCH 7/8] revert: revert auto lint --- helm/superset/values.yaml | 174 +++++++++++++++++--------------------- 1 file changed, 77 insertions(+), 97 deletions(-) diff --git a/helm/superset/values.yaml b/helm/superset/values.yaml index c427fb64cc45a..eac2c75990c4f 100644 --- a/helm/superset/values.yaml +++ b/helm/superset/values.yaml @@ -66,8 +66,7 @@ envFromSecret: '{{ template "superset.fullname" . }}-env' envFromSecrets: [] # -- Extra environment variables that will be passed into pods -extraEnv: - {} +extraEnv: {} # Different gunicorn settings, refer to the gunicorn documentation # https://docs.gunicorn.org/en/stable/settings.html# # These variables are used as Flags at the gunicorn startup @@ -90,8 +89,7 @@ extraEnv: # OAUTH_WHITELIST_REGEX: ... # -- Extra environment variables in RAW format that will be passed into pods -extraEnvRaw: - [] +extraEnvRaw: [] # Load DB password from other secret (e.g. for zalando operator) # - name: DB_PASS # valueFrom: @@ -100,8 +98,7 @@ extraEnvRaw: # key: password # -- Extra environment variables to pass as secrets -extraSecretEnv: - {} +extraSecretEnv: {} # MAPBOX_API_KEY: ... # # Google API Keys: https://console.cloud.google.com/apis/credentials # GOOGLE_KEY: ... @@ -110,8 +107,7 @@ extraSecretEnv: # SUPERSET_SECRET_KEY: 'CHANGE_ME_TO_A_COMPLEX_RANDOM_SECRET' # -- Extra files to be mounted as ConfigMap on the path specified in `extraConfigMountPath` -extraConfigs: - {} +extraConfigs: {} # import_datasources.yaml: | # databases: # - allow_file_upload: true @@ -127,8 +123,7 @@ extraConfigs: # -- Extra files to be mounted as Secrets on the path specified in `configMountPath` extraSecrets: {} -extraVolumes: - [] +extraVolumes: [] # - name: customConfig # configMap: # name: '{{ template "superset.fullname" . }}-custom-config' @@ -137,8 +132,7 @@ extraVolumes: # secretName: my-secret # defaultMode: 0600 -extraVolumeMounts: - [] +extraVolumeMounts: [] # - name: customConfig # mountPath: /mnt/config # readOnly: true @@ -148,8 +142,7 @@ extraVolumeMounts: # -- A dictionary of overrides to append at the end of superset_config.py - the name does not matter # WARNING: the order is not guaranteed # Files can be passed as helm --set-file configOverrides.my-override=my-file.py -configOverrides: - {} +configOverrides: {} # extend_timeout: | # # Extend timeout to allow long running queries. # SUPERSET_WEBSERVER_TIMEOUT = ... @@ -186,16 +179,13 @@ configOverrides: # SECRET_KEY = 'CHANGE_ME_TO_A_COMPLEX_RANDOM_SECRET' # -- Same as above but the values are files -configOverridesFiles: - {} +configOverridesFiles: {} # extend_timeout: extend_timeout.py # enable_oauth: enable_oauth.py -# -- Define where configOverrides and extraSecrets are going to be mounted -configMountPath: '/app/pythonpath' +configMountPath: "/app/pythonpath" -# -- Define where extraConfigs is going to be mounted -extraConfigMountPath: '/app/configs' +extraConfigMountPath: "/app/configs" image: repository: apachesuperset.docker.scarf.sh/apache/superset @@ -212,8 +202,7 @@ initImage: service: type: ClusterIP port: 8088 - annotations: - {} + annotations: {} # cloud.google.com/load-balancer-type: "Internal" loadBalancerIP: ~ nodePort: @@ -223,8 +212,7 @@ service: ingress: enabled: false ingressClassName: ~ - annotations: - {} + annotations: {} # kubernetes.io/tls-acme: "true" ## Extend timeout to allow long running queries. # nginx.ingress.kubernetes.io/proxy-connect-timeout: "300" @@ -240,8 +228,7 @@ ingress: # hosts: # - chart-example.local -resources: - {} +resources: {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following @@ -285,25 +272,25 @@ supersetNode: # -- Startup command # @default -- See `values.yaml` command: - - '/bin/sh' - - '-c' - - '. {{ .Values.configMountPath }}/superset_bootstrap.sh; /usr/bin/run-server.sh' + - "/bin/sh" + - "-c" + - ". {{ .Values.configMountPath }}/superset_bootstrap.sh; /usr/bin/run-server.sh" connections: # -- Change in case of bringing your own redis and then also set redis.enabled:false - redis_host: '{{ .Release.Name }}-redis-headless' - redis_port: '6379' - redis_user: '' + redis_host: "{{ .Release.Name }}-redis-headless" + redis_port: "6379" + redis_user: "" # redis_password: superset - redis_cache_db: '1' - redis_celery_db: '0' + redis_cache_db: "1" + redis_celery_db: "0" # Or SSL port is usually 6380 # Update following for using Redis with SSL redis_ssl: enabled: false ssl_cert_reqs: CERT_NONE # You need to change below configuration incase bringing own PostgresSQL instance and also set postgresql.enabled:false - db_host: '{{ .Release.Name }}-postgresql' - db_port: '5432' + db_host: "{{ .Release.Name }}-postgresql" + db_port: "5432" db_user: superset db_pass: superset db_name: superset @@ -314,11 +301,11 @@ supersetNode: # @default -- a container waiting for postgres initContainers: - name: wait-for-postgres - image: '{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}' - imagePullPolicy: '{{ .Values.initImage.pullPolicy }}' + image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}" + imagePullPolicy: "{{ .Values.initImage.pullPolicy }}" envFrom: - secretRef: - name: '{{ tpl .Values.envFromSecret . }}' + name: "{{ tpl .Values.envFromSecret . }}" command: - /bin/sh - -c @@ -366,8 +353,7 @@ supersetNode: periodSeconds: 15 successThreshold: 1 # -- Resource settings for the supersetNode pods - these settings overwrite might existing values from the global resources object defined above. - resources: - {} + resources: {} # limits: # cpu: 100m # memory: 128Mi @@ -376,8 +362,7 @@ supersetNode: # memory: 128Mi podSecurityContext: {} containerSecurityContext: {} - strategy: - {} + strategy: {} # type: RollingUpdate # rollingUpdate: # maxSurge: 25% @@ -405,20 +390,20 @@ supersetWorker: # -- Worker startup command # @default -- a `celery worker` command command: - - '/bin/sh' - - '-c' - - '. {{ .Values.configMountPath }}/superset_bootstrap.sh; celery --app=superset.tasks.celery_app:app worker' + - "/bin/sh" + - "-c" + - ". {{ .Values.configMountPath }}/superset_bootstrap.sh; celery --app=superset.tasks.celery_app:app worker" # -- If true, forces deployment to reload on each upgrade forceReload: false # -- Init container # @default -- a container waiting for postgres and redis initContainers: - name: wait-for-postgres-redis - image: '{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}' - imagePullPolicy: '{{ .Values.initImage.pullPolicy }}' + image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}" + imagePullPolicy: "{{ .Values.initImage.pullPolicy }}" envFrom: - secretRef: - name: '{{ tpl .Values.envFromSecret . }}' + name: "{{ tpl .Values.envFromSecret . }}" command: - /bin/sh - -c @@ -438,8 +423,7 @@ supersetWorker: # -- Labels to be added to supersetWorker pods podLabels: {} # -- Resource settings for the supersetWorker pods - these settings overwrite might existing values from the global resources object defined above. - resources: - {} + resources: {} # limits: # cpu: 100m # memory: 128Mi @@ -448,8 +432,7 @@ supersetWorker: # memory: 128Mi podSecurityContext: {} containerSecurityContext: {} - strategy: - {} + strategy: {} # type: RollingUpdate # rollingUpdate: # maxSurge: 25% @@ -489,20 +472,20 @@ supersetCeleryBeat: # -- Command # @default -- a `celery beat` command command: - - '/bin/sh' - - '-c' - - '. {{ .Values.configMountPath }}/superset_bootstrap.sh; celery --app=superset.tasks.celery_app:app beat --pidfile /tmp/celerybeat.pid --schedule /tmp/celerybeat-schedule' + - "/bin/sh" + - "-c" + - ". {{ .Values.configMountPath }}/superset_bootstrap.sh; celery --app=superset.tasks.celery_app:app beat --pidfile /tmp/celerybeat.pid --schedule /tmp/celerybeat-schedule" # -- If true, forces deployment to reload on each upgrade forceReload: false # -- List of init containers # @default -- a container waiting for postgres initContainers: - name: wait-for-postgres-redis - image: '{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}' - imagePullPolicy: '{{ .Values.initImage.pullPolicy }}' + image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}" + imagePullPolicy: "{{ .Values.initImage.pullPolicy }}" envFrom: - secretRef: - name: '{{ tpl .Values.envFromSecret . }}' + name: "{{ tpl .Values.envFromSecret . }}" command: - /bin/sh - -c @@ -520,8 +503,7 @@ supersetCeleryBeat: # -- Labels to be added to supersetCeleryBeat pods podLabels: {} # -- Resource settings for the CeleryBeat pods - these settings overwrite might existing values from the global resources object defined above. - resources: - {} + resources: {} # limits: # cpu: 100m # memory: 128Mi @@ -550,9 +532,9 @@ supersetCeleryFlower: # -- Command # @default -- a `celery flower` command command: - - '/bin/sh' - - '-c' - - 'celery --app=superset.tasks.celery_app:app flower' + - "/bin/sh" + - "-c" + - "celery --app=superset.tasks.celery_app:app flower" service: type: ClusterIP annotations: {} @@ -592,11 +574,11 @@ supersetCeleryFlower: # @default -- a container waiting for postgres and redis initContainers: - name: wait-for-postgres-redis - image: '{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}' - imagePullPolicy: '{{ .Values.initImage.pullPolicy }}' + image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}" + imagePullPolicy: "{{ .Values.initImage.pullPolicy }}" envFrom: - secretRef: - name: '{{ tpl .Values.envFromSecret . }}' + name: "{{ tpl .Values.envFromSecret . }}" command: - /bin/sh - -c @@ -614,8 +596,7 @@ supersetCeleryFlower: # -- Labels to be added to supersetCeleryFlower pods podLabels: {} # -- Resource settings for the CeleryBeat pods - these settings overwrite might existing values from the global resources object defined above. - resources: - {} + resources: {} # limits: # cpu: 100m # memory: 128Mi @@ -653,22 +634,22 @@ supersetWebsockets: # @default -- see `values.yaml` config: { - 'port': 8080, - 'logLevel': 'debug', - 'logToFile': false, - 'logFilename': 'app.log', - 'statsd': { 'host': '127.0.0.1', 'port': 8125, 'globalTags': [] }, - 'redis': + "port": 8080, + "logLevel": "debug", + "logToFile": false, + "logFilename": "app.log", + "statsd": { "host": "127.0.0.1", "port": 8125, "globalTags": [] }, + "redis": { - 'port': 6379, - 'host': '127.0.0.1', - 'password': '', - 'db': 0, - 'ssl': false, + "port": 6379, + "host": "127.0.0.1", + "password": "", + "db": 0, + "ssl": false, }, - 'redisStreamPrefix': 'async-events-', - 'jwtSecret': 'CHANGE-ME', - 'jwtCookieName': 'async-token', + "redisStreamPrefix": "async-events-", + "jwtSecret": "CHANGE-ME", + "jwtCookieName": "async-token", } service: type: ClusterIP @@ -728,8 +709,7 @@ init: # cause the process to be killed due to OOM if it exceeds limit # Make sure you are giving a strong password for the admin user creation( else make sure you are changing after setup) # Also change the admin email to your own custom email. - resources: - {} + resources: {} # limits: # cpu: # memory: @@ -739,13 +719,13 @@ init: # -- Command # @default -- a `superset_init.sh` command command: - - '/bin/sh' - - '-c' - - '. {{ .Values.configMountPath }}/superset_bootstrap.sh; . {{ .Values.configMountPath }}/superset_init.sh' + - "/bin/sh" + - "-c" + - ". {{ .Values.configMountPath }}/superset_bootstrap.sh; . {{ .Values.configMountPath }}/superset_init.sh" enabled: true jobAnnotations: - 'helm.sh/hook': post-install,post-upgrade - 'helm.sh/hook-delete-policy': 'before-hook-creation' + "helm.sh/hook": post-install,post-upgrade + "helm.sh/hook-delete-policy": "before-hook-creation" loadExamples: false createAdmin: true adminUser: @@ -758,11 +738,11 @@ init: # @default -- a container waiting for postgres initContainers: - name: wait-for-postgres - image: '{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}' - imagePullPolicy: '{{ .Values.initImage.pullPolicy }}' + image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}" + imagePullPolicy: "{{ .Values.initImage.pullPolicy }}" envFrom: - secretRef: - name: '{{ tpl .Values.envFromSecret . }}' + name: "{{ tpl .Values.envFromSecret . }}" command: - /bin/sh - -c @@ -832,7 +812,7 @@ postgresql: database: superset image: - tag: '14.6.0-debian-11-r13' + tag: "14.6.0-debian-11-r13" ## PostgreSQL Primary parameters primary: @@ -853,7 +833,7 @@ postgresql: ## PostgreSQL port service: ports: - postgresql: '5432' + postgresql: "5432" # -- Configuration values for the Redis dependency. # ref: https://github.com/bitnami/charts/blob/master/bitnami/redis @@ -877,9 +857,9 @@ redis: ## Enable password authentication enabled: false ## The name of an existing secret that contains the redis password. - existingSecret: '' + existingSecret: "" ## Name of the key containing the secret. - existingSecretKey: '' + existingSecretKey: "" ## Redis password password: superset ## From 78f2ff53fc8ef889e227215e946be36fa6a1b82c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pedro=20Alc=C3=A2ntara?= Date: Thu, 2 Jan 2025 18:41:02 -0300 Subject: [PATCH 8/8] fix: fix typo --- helm/superset/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/superset/README.md b/helm/superset/README.md index cd187a17d1310..d8fd9fe2a9176 100644 --- a/helm/superset/README.md +++ b/helm/superset/README.md @@ -60,12 +60,12 @@ On helm this can be set on `extraSecretEnv.SUPERSET_SECRET_KEY` or `configOverri | affinity | object | `{}` | | | bootstrapScript | string | see `values.yaml` | Install additional packages and do any other bootstrap configuration in this script For production clusters it's recommended to build own image with this step done in CI | | configFromSecret | string | `"{{ template \"superset.fullname\" . }}-config"` | The name of the secret which we will use to generate a superset_config.py file Note: this secret must have the key superset_config.py in it and can include other files as well | -| configMountPath | string | `"/app/pythonpath"` | Define where configOverrides and extraSecrets are going to be mounted | +| configMountPath | string | `"/app/pythonpath"` | | | configOverrides | object | `{}` | A dictionary of overrides to append at the end of superset_config.py - the name does not matter WARNING: the order is not guaranteed Files can be passed as helm --set-file configOverrides.my-override=my-file.py | | configOverridesFiles | object | `{}` | Same as above but the values are files | | envFromSecret | string | `"{{ template \"superset.fullname\" . }}-env"` | The name of the secret which we will use to populate env vars in deployed pods This can be useful for secret keys, etc. | | envFromSecrets | list | `[]` | This can be a list of templated strings | -| extraConfigMountPath | string | `"/app/configs"` | Define where extraConfigs is going to be mounted | +| extraConfigMountPath | string | `"/app/configs"` | | | extraConfigs | object | `{}` | Extra files to be mounted as ConfigMap on the path specified in `extraConfigMountPath` | | extraEnv | object | `{}` | Extra environment variables that will be passed into pods | | extraEnvRaw | list | `[]` | Extra environment variables in RAW format that will be passed into pods |