Blinkit dev 1.5.1

helm/superset/Chart.yaml

@@ -30,12 +30,3 @@ maintainers:
     email: [email protected]
     url: https://github.com/craig-rueda
 version: 0.7.7
-dependencies:
-  - name: postgresql
-    version: 11.1.22
-    repository: https://charts.bitnami.com/bitnami
-    condition: postgresql.enabled
-  - name: redis
-    version: 16.3.1
-    repository: https://charts.bitnami.com/bitnami
-    condition: redis.enabled

helm/superset/templates/_helpers.tpl

@@ -79,6 +79,8 @@ CACHE_CONFIG = {
 }
 DATA_CACHE_CONFIG = CACHE_CONFIG
 
+ENABLE_PROXY_FIX = True
+PROXY_FIX_CONFIG = {"x_for": 1, "x_proto": 1, "x_host": 1, "x_port": 0, "x_prefix": 1}
 SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg2://{env('DB_USER')}:{env('DB_PASS')}@{env('DB_HOST')}:{env('DB_PORT')}/{env('DB_NAME')}"
 SQLALCHEMY_TRACK_MODIFICATIONS = True
 SECRET_KEY = env('SECRET_KEY', 'thisISaSECRET_1234')
@@ -93,11 +95,11 @@ class CeleryConfig(object):
   CELERY_IMPORTS = ('superset.sql_lab', )
   CELERY_ANNOTATIONS = {'tasks.add': {'rate_limit': '10/s'}}
 {{- if .Values.supersetNode.connections.redis_password }}
-  BROKER_URL = f"redis://:{env('REDIS_PASSWORD')}@{env('REDIS_HOST')}:{env('REDIS_PORT')}/0"
-  CELERY_RESULT_BACKEND = f"redis://:{env('REDIS_PASSWORD')}@{env('REDIS_HOST')}:{env('REDIS_PORT')}/0"
+  BROKER_URL = f"redis://:{env('REDIS_PASSWORD')}@{env('REDIS_HOST')}:{env('REDIS_PORT')}/{env('REDIS_DB')}"
+  CELERY_RESULT_BACKEND = f"redis://:{env('REDIS_PASSWORD')}@{env('REDIS_HOST')}:{env('REDIS_PORT')}/{env('REDIS_DB')}"
 {{- else }}
-  BROKER_URL = f"redis://{env('REDIS_HOST')}:{env('REDIS_PORT')}/0"
-  CELERY_RESULT_BACKEND = f"redis://{env('REDIS_HOST')}:{env('REDIS_PORT')}/0"
+  BROKER_URL = f"redis://{env('REDIS_HOST')}:{env('REDIS_PORT')}/{env('REDIS_DB')}"
+  CELERY_RESULT_BACKEND = f"redis://{env('REDIS_HOST')}:{env('REDIS_PORT')}/{env('REDIS_DB')}"
 {{- end }}
 
 CELERY_CONFIG = CeleryConfig
@@ -107,6 +109,7 @@ RESULTS_BACKEND = RedisCache(
       password=env('REDIS_PASSWORD'),
 {{- end }}
       port=env('REDIS_PORT'),
+      db=env('REDIS_DB'),
       key_prefix='superset_results'
 )
 

helm/superset/templates/deployment.yaml

@@ -81,6 +81,16 @@ spec:
       hostAliases: {{- toYaml . | nindent 6 }}
       {{- end }}
       containers:
+        - name: nginx
+          image: nginx
+          imagePullPolicy: IfNotPresent
+          ports:
+            - name: nginx
+              containerPort: 80
+          volumeMounts:
+            - name: superset-extra-config
+              mountPath: /etc/nginx/conf.d/default.conf
+              subPath: nginx.conf
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}

helm/superset/templates/secret-env.yaml

@@ -31,6 +31,7 @@ stringData:
     REDIS_PASSWORD: {{ .Values.supersetNode.connections.redis_password | quote }}
     {{- end }}
     REDIS_PORT: {{ .Values.supersetNode.connections.redis_port | quote }}
+    REDIS_DB: {{ .Values.supersetNode.connections.redis_db | quote }}
     DB_HOST: {{ tpl .Values.supersetNode.connections.db_host . | quote }}
     DB_PORT: {{ .Values.supersetNode.connections.db_port | quote }}
     DB_USER: {{ .Values.supersetNode.connections.db_user | quote }}

helm/superset/templates/service.yaml

@@ -31,10 +31,10 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
+    - port: {{ .Values.service.servicePort }}
+      targetPort: 80
       protocol: TCP
-      name: http
+      name: https
   selector:
     app: {{ template "superset.name" . }}
     release: {{ .Release.Name }}

helm/superset/values.yaml

@@ -196,8 +196,8 @@ initImage:
 service:
   type: ClusterIP
   port: 8088
-  annotations:
-    {}
+  servicePort: 8088
+  annotations: {}
     # cloud.google.com/load-balancer-type: "Internal"
   loadBalancerIP: null
 
@@ -256,6 +256,7 @@ supersetNode:
     redis_host: '{{ template "superset.fullname" . }}-redis-headless'
     # redis_password: superset
     redis_port: "6379"
+    redis_db: "0"
     # You need to change below configuration incase bringing own PostgresSQL instance and also set postgresql.enabled:false
     db_host: '{{ template "superset.fullname" . }}-postgresql'
     db_port: "5432"