local-it/dashboard
Archived
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

process feedback

Browse source
This commit is contained in:
Maarten de Waard 2021-10-06 14:38:20 +02:00
parent 173f2d7bf1
commit 3b5662a098
No known key found for this signature in database
GPG key ID: 1D3E893A657CC8DA
7 changed files with 36 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

12
deployment/helmchart/templates/_helpers.tpl
View file

@ -18,7 +18,7 @@ Return the proper container image registry secret names
{{- end -}}
{{/*
Return true if a secret object for Admin-frontend should be created
Return true if a secret object for backend should be created
*/}}
{{- define "backend.createSecret" -}}
{{- if or (not .Values.backend.existingSecret) (and (not .Values.backend.smtp.existingSecret) .Values.backend.smtp.password .Values.backend.smtp.enabled) }}
@ -27,7 +27,7 @@ Return true if a secret object for Admin-frontend should be created
{{- end -}}
{{/*
Return the Admin-backend secret name
Return the backend secret name
*/}}
{{- define "backend.secretName" -}}
{{- if .Values.backend.existingSecret }}
@ -38,7 +38,7 @@ Return the Admin-backend secret name
{{- end -}}
{{/*
Return the Admin-backend SMTP secret name
Return the backend SMTP secret name
*/}}
{{- define "backend.smtp.secretName" -}}
{{- if .Values.backend.smtp.existingSecret }}
@ -49,7 +49,7 @@ Return the Admin-backend SMTP secret name
{{- end -}}
{{/*
Return true if Admin-backend SMTP uses password authentication
Return true if backend SMTP uses password authentication
*/}}
{{- define "backend.smtp.password.enabled" -}}
{{- if and (or .Values.backend.smtp.password .Values.backend.smtp.existingSecret) .Values.backend.smtp.enabled }}
@ -114,13 +114,13 @@ If not using ClusterIP, or if a host or LoadBalancerIP is not defined, the value
{{- end -}}
{{/*
Return the proper Admin-frontend image name
Return the proper frontend image name
*/}}
{{- define "frontend.image" -}}
{{ include "common.images.image" (dict "imageRoot" .Values.frontend.image "global" .Values.global) }}
{{- end -}}
{{/*
Return the proper Admin-backend image name
Return the proper backend image name
*/}}
{{- define "backend.image" -}}
{{ include "common.images.image" (dict "imageRoot" .Values.backend.image "global" .Values.global) }}

2
deployment/helmchart/templates/configmaps.yaml
View file

@ -13,8 +13,6 @@ data:
SECRET_KEY: {{ .Values.backend.secretKey }}
FLASK_APP: app.py
FLASK_ENV: {{ .Values.backend.flaskEnv }}
# ADMIN_FRONTEND_HOST: "{{ include "frontend.host" . }}"
# ADMIN_BACKEND_HOST: "{{ include "backend.host" . }}"
# Probably needed in the future:
# ADMIN_BACKEND_USERNAME: {{ .Values.backend.username | quote }}
# ADMIN_BACKEND_EMAIL: {{ .Values.backend.email | quote }}

2
deployment/helmchart/templates/deployment.yaml
View file

@ -1,4 +1,3 @@
{{- if include "frontend.host" . -}}
apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }}
kind: Deployment
metadata:
@ -198,4 +197,3 @@ spec:
{{- if .Values.extraVolumes }}
{{- include "common.tplvalues.render" (dict "value" .Values.extraVolumes "context" $) | nindent 8 }}
{{- end }}
{{- end }}