improve helm chart

install/helm/superset/Chart.yaml

@@ -16,7 +16,7 @@
 #
 apiVersion: v1
 appVersion: "1.0"
-description: A Helm chart for Kubernetes
+description: Apache Superset is a modern, enterprise-ready business intelligence web application
 name: superset
 maintainers:
   - name: Chuan-Yen Chiang

install/helm/superset/templates/configmap.yaml → install/helm/superset/requirements.yaml

@@ -14,14 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: superset-configmap
-  labels:
-    app: {{ template "superset.name" . }}
-    chart: {{ template "superset.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-data:
-{{ (.Files.Glob "config/*").AsConfig | indent 2 }}
+dependencies:
+- name: postgresql
+  version: 8.1.4
+  repository: https://kubernetes-charts.storage.googleapis.com/
+  condition: postgresql.enabled
+- name: redis
+  version: 10.3.4
+  repository: https://kubernetes-charts.storage.googleapis.com/
+  condition: redis.enabled

install/helm/superset/templates/_helpers.tpl

@@ -48,3 +48,39 @@ Create chart name and version as used by the chart label.
 {{- define "superset.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{- define "superset-connections.script" }}
+import os
+from werkzeug.contrib.cache import RedisCache
+MAPBOX_API_KEY = os.getenv('MAPBOX_API_KEY', '')
+
+CACHE_CONFIG = {
+      'CACHE_TYPE': 'redis',
+      'CACHE_DEFAULT_TIMEOUT': 300,
+      'CACHE_KEY_PREFIX': 'superset_',
+      'CACHE_REDIS_HOST': os.getenv('REDIS_HOST'),
+      'CACHE_REDIS_PORT': os.getenv('REDIS_PORT'),
+      'CACHE_REDIS_DB': 1,
+      'CACHE_REDIS_URL': 'redis://%s:%s/1' % (os.getenv('REDIS_HOST'),os.getenv('REDIS_PORT'))}
+SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://%s:%s@%s:%s/%s' % (os.getenv('DB_USER'), os.getenv('DB_PASS'), os.getenv('DB_HOST'), os.getenv('DB_PORT'), os.getenv('DB_NAME'))
+SQLALCHEMY_TRACK_MODIFICATIONS = True
+SECRET_KEY = 'thisISaSECRET_1234'
+# Flask-WTF flag for CSRF
+WTF_CSRF_ENABLED = True
+# Add endpoints that need to be exempt from CSRF protection
+WTF_CSRF_EXEMPT_LIST = []
+# A CSRF token that expires in 1 year
+WTF_CSRF_TIME_LIMIT = 60 * 60 * 24 * 365
+class CeleryConfig(object):
+  BROKER_URL = 'redis://%s:%s/0' % (os.getenv('REDIS_HOST'),os.getenv('REDIS_PORT'))
+  CELERY_IMPORTS = ('superset.sql_lab', )
+  CELERY_RESULT_BACKEND = 'redis://%s:%s/0' % (os.getenv('REDIS_HOST'),os.getenv('REDIS_PORT'))
+  CELERY_ANNOTATIONS = {'tasks.add': {'rate_limit': '10/s'}}
+
+CELERY_CONFIG = CeleryConfig
+RESULTS_BACKEND = RedisCache(
+      host= os.getenv('REDIS_HOST'),
+      port= os.getenv('REDIS_PORT'),
+      key_prefix='superset_results'
+)
+{{- end }}

install/helm/superset/templates/deployment.yaml

@@ -39,9 +39,46 @@ spec:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: REDIS_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: superset-secret
+                  key: redis_host
+            - name: REDIS_PORT
+              valueFrom:
+                secretKeyRef:
+                  name: superset-secret
+                  key: redis_port
+            - name: DB_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: superset-secret
+                  key: db_host
+            - name: DB_PORT
+              valueFrom:
+                secretKeyRef:
+                  name: superset-secret
+                  key: db_port
+            - name: DB_USER
+              valueFrom:
+                secretKeyRef:
+                  name: superset-secret
+                  key: db_user
+            - name: DB_PASS
+              valueFrom:
+                secretKeyRef:
+                  name: superset-secret
+                  key: db_pass         
+            - name: DB_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: superset-secret
+                  key: db_name 
           volumeMounts:
             - name: superset-config
-              mountPath: /etc/superset/
+              mountPath: "/etc/superset"
+              readOnly: true
           ports:
             - name: http
               containerPort: 8088
@@ -61,6 +98,6 @@ spec:
 {{ toYaml . | indent 8 }}
     {{- end }}
       volumes:
-        - name: "superset-config"
-          configMap:
-            name: superset-configmap
+        - name: superset-config
+          secret:
+            secretName: superset-config

install/helm/superset/templates/init-job.yaml

@@ -0,0 +1,80 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+{{- if and ( .Values.initContainers ) ( .Values.init.enabled ) }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ template "superset.name" . }}-init-db
+  annotations:
+spec:
+  template:
+    metadata:
+      name: {{ template "superset.name" . }}-init-db
+    spec:
+      initContainers:
+      {{-  toYaml .Values.initContainers | nindent 6 }}
+      containers:
+      - name: {{ template "superset.name" . }}-init-db
+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        env:
+          - name: REDIS_HOST
+            valueFrom:
+              secretKeyRef:
+                name: superset-secret
+                key: redis_host
+          - name: REDIS_PORT
+            valueFrom:
+              secretKeyRef:
+                name: superset-secret
+                key: redis_port
+          - name: DB_HOST
+            valueFrom:
+              secretKeyRef:
+                name: superset-secret
+                key: db_host
+          - name: DB_PORT
+            valueFrom:
+              secretKeyRef:
+                name: superset-secret
+                key: db_port
+          - name: DB_USER
+            valueFrom:
+              secretKeyRef:
+                name: superset-secret
+                key: db_user
+          - name: DB_PASS
+            valueFrom:
+              secretKeyRef:
+                name: superset-secret
+                key: db_pass         
+          - name: DB_NAME
+            valueFrom:
+              secretKeyRef:
+                name: superset-secret
+                key: db_name 
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        volumeMounts:
+          - name: superset-config
+            mountPath: "/etc/superset"
+            readOnly: true
+        command: [ "/bin/sh", "-c", "{{ .Values.init.initscript }}" ]
+      volumes:
+        - name: superset-config
+          secret:
+            secretName: superset-config
+      restartPolicy: Never
+{{- end }}

install/helm/superset/templates/secret-superset-config.yaml

@@ -0,0 +1,28 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "superset.fullname" . }}-config
+  labels:
+    app: {{ template "superset.fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+type: Opaque
+data: 
+  superset_config.py: {{ include "superset-connections.script" . | b64enc }}

install/helm/superset/templates/secret.yaml

@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "superset.fullname" . }}-secret
+  labels:
+    app: {{ template "superset.fullname" . }}
+    chart: {{ template "superset.chart" . }}
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+type: Opaque
+data:
+    redis_host: {{ .Values.supersetNode.connections.redis_host | b64enc | quote }}
+    redis_port: {{ .Values.supersetNode.connections.redis_port | b64enc | quote }}
+    db_host: {{ .Values.supersetNode.connections.db_host | b64enc | quote }}
+    db_port: {{ .Values.supersetNode.connections.db_port | b64enc | quote }}
+    db_user: {{ .Values.supersetNode.connections.db_user | b64enc | quote }}
+    db_pass: {{ .Values.supersetNode.connections.db_pass | b64enc | quote }}
+    db_name: {{ .Values.supersetNode.connections.db_name | b64enc | quote }}