version with working front-end

This commit is contained in:
Maarten de Waard 2021-10-04 13:53:13 +02:00
parent 82abc9b73d
commit e15ac52be7
No known key found for this signature in database
GPG key ID: 1D3E893A657CC8DA
12 changed files with 266 additions and 135 deletions

View file

@ -20,39 +20,39 @@ Return the proper Docker image registry secret names
{{/*
Return true if a secret object for Admin-frontend should be created
*/}}
{{- define "adminPanel.createSecret" -}}
{{- if or (not .Values.adminPanel.existingSecret) (and (not .Values.adminPanel.smtp.existingSecret) .Values.adminPanel.smtp.password .Values.adminPanel.smtp.enabled) }}
{{- define "adminBackend.createSecret" -}}
{{- if or (not .Values.adminBackend.existingSecret) (and (not .Values.adminBackend.smtp.existingSecret) .Values.adminBackend.smtp.password .Values.adminBackend.smtp.enabled) }}
{{- true -}}
{{- end -}}
{{- end -}}
{{/*
Return the Admin-frontend secret name
Return the Admin-backend secret name
*/}}
{{- define "adminPanel.secretName" -}}
{{- if .Values.adminPanel.existingSecret }}
{{- printf "%s" .Values.adminPanel.existingSecret -}}
{{- define "adminBackend.secretName" -}}
{{- if .Values.adminBackend.existingSecret }}
{{- printf "%s" .Values.adminBackend.existingSecret -}}
{{- else -}}
{{- printf "%s-adminPanel" (include "common.names.fullname" .) -}}
{{- printf "%s-admin-backend" (include "common.names.fullname" .) -}}
{{- end -}}
{{- end -}}
{{/*
Return the Admin-frontend SMTP secret name
Return the Admin-backend SMTP secret name
*/}}
{{- define "adminPanel.smtp.secretName" -}}
{{- if .Values.adminPanel.smtp.existingSecret }}
{{- printf "%s" .Values.adminPanel.smtp.existingSecret -}}
{{- define "adminBackend.smtp.secretName" -}}
{{- if .Values.adminBackend.smtp.existingSecret }}
{{- printf "%s" .Values.adminBackend.smtp.existingSecret -}}
{{- else -}}
{{- printf "%s-adminPanel" (include "common.names.fullname" .) -}}
{{- printf "%s-admin-backend" (include "common.names.fullname" .) -}}
{{- end -}}
{{- end -}}
{{/*
Return true if Admin-frontend SMTP uses password authentication
Return true if Admin-backend SMTP uses password authentication
*/}}
{{- define "adminPanel.smtp.password.enabled" -}}
{{- if and (or .Values.adminPanel.smtp.password .Values.adminPanel.smtp.existingSecret) .Values.adminPanel.smtp.enabled }}
{{- define "adminBackend.smtp.password.enabled" -}}
{{- if and (or .Values.adminBackend.smtp.password .Values.adminBackend.smtp.existingSecret) .Values.adminBackend.smtp.enabled }}
{{- true -}}
{{- end -}}
{{- end -}}
@ -61,11 +61,11 @@ Return true if Admin-frontend SMTP uses password authentication
Get the user defined LoadBalancerIP for this release
Note, returns 127.0.0.1 if using ClusterIP.
*/}}
{{- define "adminPanel.serviceIP" -}}
{{- if eq .Values.service.type "ClusterIP" -}}
{{- define "adminFrontend.serviceIP" -}}
{{- if eq .Values.adminFrontend.service.type "ClusterIP" -}}
127.0.0.1
{{- else -}}
{{- .Values.service.loadBalancerIP | default "" -}}
{{- .Values.adminFrontend.service.loadBalancerIP | default "" -}}
{{- end -}}
{{- end -}}
@ -73,9 +73,44 @@ Note, returns 127.0.0.1 if using ClusterIP.
Gets the host to be used for this application.
If not using ClusterIP, or if a host or LoadBalancerIP is not defined, the value will be empty
*/}}
{{- define "adminPanel.host" -}}
{{- $host := .Values.adminPanel.host | default "" -}}
{{- default (include "adminPanel.serviceIP" .) $host -}}
{{- define "adminFrontend.host" -}}
{{- $host := .Values.adminFrontend.host | default "" -}}
{{- default (include "adminFrontend.serviceIP" .) $host -}}
{{- end -}}
{{/*
Service name for the backend service
*/}}
{{- define "adminBackend.serviceName" -}}
{{ include "common.names.fullname" . }}-backend
{{- end -}}
{{/*
Service name for the frontend service
*/}}
{{- define "adminFrontend.serviceName" -}}
{{ include "common.names.fullname" . }}-frontend
{{- end -}}
{{/*
Get the user defined LoadBalancerIP for this release
Note, returns 127.0.0.1 if using ClusterIP.
*/}}
{{- define "adminBackend.serviceIP" -}}
{{- if eq .Values.adminBackend.service.type "ClusterIP" -}}
127.0.0.1
{{- else -}}
{{- .Values.adminBackend.service.loadBalancerIP | default "" -}}
{{- end -}}
{{- end -}}
{{/*
Gets the host to be used for this application.
If not using ClusterIP, or if a host or LoadBalancerIP is not defined, the value will be empty
*/}}
{{- define "adminBackend.host" -}}
{{- $host := .Values.adminBackend.host | default "" -}}
{{- default (include "adminBackend.serviceIP" .) $host -}}
{{- end -}}
{{/*