chore(helm): Reformat helm chart templates

apache · Apr 13, 2023 · c794cf7 · c794cf7
1 parent 04bd528
commit c794cf7
Show file tree

Hide file tree

Showing 18 changed files with 286 additions and 352 deletions.
diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml
@@ -29,7 +29,7 @@ maintainers:
   - name: craig-rueda
     email: [email protected]
     url: https://github.com/craig-rueda
-version: 0.9.1
+version: 0.9.2
 dependencies:
   - name: postgresql
     version: 12.1.6

diff --git 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.9.1](https://img.shields.io/badge/Version-0.9.1-informational?style=flat-square)
+![Version: 0.9.2](https://img.shields.io/badge/Version-0.9.2-informational?style=flat-square)
 
 Apache Superset is a modern, enterprise-ready business intelligence web application
 

diff --git a/helm/superset/templates/NOTES.txt b/helm/superset/templates/NOTES.txt
@@ -18,9 +18,9 @@
 */}}
 1. Get the application URL by running these commands:
 {{- if .Values.ingress.enabled }}
-{{- range .Values.ingress.hosts }}
+  {{- range .Values.ingress.hosts }}
   http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
-{{- end }}
+  {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
   export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "superset.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")

diff --git a/helm/superset/templates/_helpers.tpl b/helm/superset/templates/_helpers.tpl
@@ -21,7 +21,7 @@
 Expand the name of the chart.
 */}}
 {{- define "superset.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+  {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
@@ -30,34 +30,34 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "superset.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
+  {{- if .Values.fullnameOverride -}}
+    {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+  {{- else -}}
+    {{- $name := default .Chart.Name .Values.nameOverride -}}
+    {{- if contains $name .Release.Name -}}
+      {{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+    {{- else -}}
+      {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+    {{- end -}}
+  {{- end -}}
 {{- end -}}
 
 {{/*
 Create the name of the service account to use
 */}}
 {{- define "superset.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-{{- default (include "superset.fullname" .) .Values.serviceAccountName -}}
-{{- else -}}
-{{- default "default" .Values.serviceAccountName -}}
-{{- end -}}
+  {{- if .Values.serviceAccount.create -}}
+    {{- default (include "superset.fullname" .) .Values.serviceAccountName -}}
+  {{- else -}}
+    {{- default "default" .Values.serviceAccountName -}}
+  {{- end -}}
 {{- end -}}
 
 {{/*
 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 "-" -}}
+  {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{- define "superset-config" }}
@@ -86,20 +86,20 @@ SECRET_KEY = env('SECRET_KEY', 'thisISaSECRET_1234')
 class CeleryConfig(object):
   CELERY_IMPORTS = ('superset.sql_lab', )
   CELERY_ANNOTATIONS = {'tasks.add': {'rate_limit': '10/s'}}
-{{- if .Values.supersetNode.connections.redis_password }}
+  {{- 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"
-{{- else }}
+  {{- else }}
   BROKER_URL = f"redis://{env('REDIS_HOST')}:{env('REDIS_PORT')}/0"
   CELERY_RESULT_BACKEND = f"redis://{env('REDIS_HOST')}:{env('REDIS_PORT')}/0"
-{{- end }}
+  {{- end }}
 
 CELERY_CONFIG = CeleryConfig
 RESULTS_BACKEND = RedisCache(
       host=env('REDIS_HOST'),
-{{- if .Values.supersetNode.connections.redis_password }}
+      {{- if .Values.supersetNode.connections.redis_password }}
       password=env('REDIS_PASSWORD'),
-{{- end }}
+      {{- end }}
       port=env('REDIS_PORT'),
       key_prefix='superset_results'
 )
@@ -111,6 +111,7 @@ RESULTS_BACKEND = RedisCache(
 {{ tpl $value $ }}
 {{- end }}
 {{- end }}
+
 {{ if .Values.configOverridesFiles }}
 # Overrides from files
 {{- $files := .Files }}

diff --git a/helm/superset/templates/configmap-superset.yaml b/helm/superset/templates/configmap-superset.yaml
@@ -19,15 +19,15 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "superset.fullname" . }}-extra-config
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "superset.name" . }}
     chart: {{ template "superset.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-  namespace: {{ .Release.Namespace }}
 data:
-{{- range $path, $config := .Values.extraConfigs }}
+  {{- range $path, $config := .Values.extraConfigs }}
   {{ $path }}: |
-{{- tpl $config $ | nindent 4 -}}
-{{- end -}}
+    {{- tpl $config $ | nindent 4 -}}
+  {{- end -}}
 {{- end -}}
diff --git a/helm/superset/templates/deployment-beat.yaml b/helm/superset/templates/deployment-beat.yaml
@@ -19,16 +19,15 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "superset.fullname" . }}-celerybeat
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "superset.name" . }}-celerybeat
     chart: {{ template "superset.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-{{- if .Values.supersetCeleryBeat.deploymentAnnotations }}
-  annotations:
-    {{- toYaml .Values.supersetCeleryBeat.deploymentAnnotations | nindent 4 }}
-{{- end }}
-  namespace: {{ .Release.Namespace }}
+  {{- if .Values.supersetCeleryBeat.deploymentAnnotations }}
+  annotations: {{- toYaml .Values.supersetCeleryBeat.deploymentAnnotations | nindent 4 }}
+  {{- end }}
 spec:
   # This must be a singleton
   replicas: 1
@@ -46,31 +45,30 @@ spec:
         checksum/extraSecretEnv: {{ .Values.extraSecretEnv | toYaml | sha256sum }}
         checksum/configOverrides: {{ .Values.configOverrides | toYaml | sha256sum }}
         checksum/configOverridesFiles: {{ .Values.configOverridesFiles | toYaml | sha256sum }}
-        {{ if .Values.supersetCeleryBeat.forceReload }}
+        {{- if .Values.supersetCeleryBeat.forceReload }}
         # Optionally force the thing to reload
         force-reload: {{ randAlphaNum 5 | quote }}
-        {{ end }}
-      {{- if .Values.supersetCeleryBeat.podAnnotations }}
-        {{- toYaml .Values.supersetCeleryBeat.podAnnotations | nindent 8 }}
-      {{- end }}
+        {{- end }}
+        {{- if .Values.supersetCeleryBeat.podAnnotations }}
+          {{- toYaml .Values.supersetCeleryBeat.podAnnotations | nindent 8 }}
+        {{- end }}
       labels:
         app: "{{ template "superset.name" . }}-celerybeat"
         release: {{ .Release.Name }}
-      {{- if .Values.supersetCeleryBeat.podLabels }}
-        {{- toYaml .Values.supersetCeleryBeat.podLabels | nindent 8 }}
-      {{- end }}
+        {{- if .Values.supersetCeleryBeat.podLabels }}
+          {{- toYaml .Values.supersetCeleryBeat.podLabels | nindent 8 }}
+        {{- end }}
     spec:
       {{- if or (.Values.serviceAccount.create) (.Values.serviceAccountName) }}
       serviceAccountName: {{ template "superset.serviceAccountName" . }}
       {{- end }}
       securityContext:
         runAsUser: {{ .Values.runAsUser }}
-      {{- if .Values.supersetCeleryBeat.podSecurityContext }}
-        {{- toYaml .Values.supersetCeleryBeat.podSecurityContext | nindent 8 }}
-      {{- end }}
+        {{- if .Values.supersetCeleryBeat.podSecurityContext }}
+          {{- toYaml .Values.supersetCeleryBeat.podSecurityContext | nindent 8 }}
+        {{- end }}
       {{- if .Values.supersetCeleryBeat.initContainers }}
-      initContainers:
-      {{-  tpl (toYaml .Values.supersetCeleryBeat.initContainers) . | nindent 6 }}
+      initContainers: {{-  tpl (toYaml .Values.supersetCeleryBeat.initContainers) . | nindent 6 }}
       {{- end }}
       {{- with .Values.hostAliases }}
       hostAliases: {{- toYaml . | nindent 6 }}
@@ -91,7 +89,7 @@ spec:
               value: {{ $value | quote }}
             {{- end }}
             {{- if .Values.extraEnvRaw }}
-            {{- toYaml .Values.extraEnvRaw | nindent 12 }}
+              {{- toYaml .Values.extraEnvRaw | nindent 12 }}
             {{- end }}
           envFrom:
             - secretRef:
@@ -109,44 +107,41 @@ spec:
               mountPath: {{ .Values.extraConfigMountPath | quote }}
               readOnly: true
             {{- end }}
-          {{- with .Values.extraVolumeMounts }}
-          {{- tpl (toYaml .) $ | nindent 12 -}}
-          {{- end }}
+            {{- with .Values.extraVolumeMounts }}
+              {{- tpl (toYaml .) $ | nindent 12 }}
+            {{- end }}
           resources:
-          {{- if .Values.supersetCeleryBeat.resources }}
-            {{- toYaml .Values.supersetCeleryBeat.resources | nindent 12 }}
-          {{- else }}
-            {{- toYaml .Values.resources | nindent 12 }}
-          {{- end }}
+            {{- if .Values.supersetCeleryBeat.resources }}
+              {{- toYaml .Values.supersetCeleryBeat.resources | nindent 12 }}
+            {{- else }}
+              {{- toYaml .Values.resources | nindent 12 }}
+            {{- end }}
       {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
+      nodeSelector: {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- if or .Values.affinity .Values.supersetCeleryBeat.affinity }}
       affinity:
         {{- with .Values.affinity }}
-        {{- toYaml . | nindent 8 }}
+          {{- toYaml . | nindent 8 }}
         {{- end }}
         {{- with .Values.supersetCeleryBeat.affinity }}
-        {{- toYaml . | nindent 8 }}
+          {{- toYaml . | nindent 8 }}
         {{- end }}
       {{- end }}
       {{- if or .Values.topologySpreadConstraints .Values.supersetCeleryBeat.topologySpreadConstraints }}
       topologySpreadConstraints:
         {{- with .Values.topologySpreadConstraints }}
-        {{- toYaml . | nindent 8 }}
+          {{- toYaml . | nindent 8 }}
         {{- end }}
         {{- with .Values.supersetCeleryBeat.topologySpreadConstraints }}
-        {{- toYaml . | nindent 8 }}
+          {{- toYaml . | nindent 8 }}
         {{- end }}
       {{- end }}
       {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
+      tolerations: {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- if .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml .Values.imagePullSecrets | nindent 8 }}
+      imagePullSecrets: {{- toYaml .Values.imagePullSecrets | nindent 8 }}
       {{- end }}
       volumes:
         - name: superset-config
@@ -157,7 +152,7 @@ spec:
           configMap:
             name: {{ template "superset.fullname" . }}-extra-config
         {{- end }}
-      {{- with .Values.extraVolumes }}
-      {{- tpl (toYaml .) $ | nindent 8 -}}
-      {{- end }}
+        {{- with .Values.extraVolumes }}
+          {{- tpl (toYaml .) $ | nindent 8 -}}
+        {{- end }}
 {{- end -}}