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

@ -1,4 +1,4 @@
{{- if and (include "adminFrontend.host" .) (include "adminBackend.host" .) -}}
{{- if include "adminFrontend.host" . -}}
apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }}
kind: Deployment
metadata:
@ -30,7 +30,7 @@ spec:
annotations: {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
{{- end }}
spec:
{{- include "adminFrontend.imagePullSecrets" . | nindent 6 }}
{{- include "adminPanel.imagePullSecrets" . | nindent 6 }}
{{- if .Values.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }}
{{- end }}
@ -55,7 +55,7 @@ spec:
{{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
{{- end }}
containers:
- name: adminFrontend
- name: admin-frontend
securityContext: {{- toYaml .Values.adminFrontend.containerSecurityContext | nindent 12 }}
image: {{ template "adminFrontend.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
@ -81,14 +81,14 @@ spec:
name: {{ .Values.adminFrontend.extraEnvVarsSecret }}
{{- end }}
ports:
- name: http
containerPort: 3000
- name: frontend-http
containerPort: 80
protocol: TCP
{{- if .Values.adminFrontend.livenessProbe.enabled }}
livenessProbe:
httpGet:
path: /srv/status
port: http
port: frontend-http
initialDelaySeconds: {{ .Values.adminFrontend.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.adminFrontend.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.adminFrontend.livenessProbe.timeoutSeconds }}
@ -101,7 +101,7 @@ spec:
readinessProbe:
httpGet:
path: /srv/status
port: http
port: frontend-http
initialDelaySeconds: {{ .Values.adminFrontend.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.adminFrontend.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.adminFrontend.readinessProbe.timeoutSeconds }}
@ -111,16 +111,13 @@ spec:
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
volumeMounts:
- name: adminFrontend-data
mountPath: /bitnami/adminFrontend
subPath: adminFrontend
{{- if .Values.adminFrontend.extraVolumeMounts }}
{{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.extraVolumeMounts "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.adminFrontend.resources }}
resources: {{- toYaml .Values.adminFrontend.resources | nindent 12 }}
{{- end }}
- name: adminBackend
- name: admin-backend
securityContext: {{- toYaml .Values.adminBackend.containerSecurityContext | nindent 12 }}
image: {{ template "adminBackend.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
@ -158,14 +155,14 @@ spec:
name: {{ .Values.adminBackend.extraEnvVarsSecret }}
{{- end }}
ports:
- name: http
containerPort: 3000
- name: backend-http
containerPort: 5000
protocol: TCP
{{- if .Values.adminBackend.livenessProbe.enabled }}
livenessProbe:
httpGet:
path: /srv/status
port: http
port: backend-http
initialDelaySeconds: {{ .Values.adminBackend.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.adminBackend.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.adminBackend.livenessProbe.timeoutSeconds }}
@ -178,7 +175,7 @@ spec:
readinessProbe:
httpGet:
path: /srv/status
port: http
port: backend-http
initialDelaySeconds: {{ .Values.adminBackend.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.adminBackend.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.adminBackend.readinessProbe.timeoutSeconds }}
@ -188,9 +185,6 @@ spec:
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.adminBackend.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
volumeMounts:
- name: adminBackend-data
mountPath: /bitnami/adminBackend
subPath: adminBackend
{{- if .Values.adminBackend.extraVolumeMounts }}
{{- include "common.tplvalues.render" (dict "value" .Values.adminBackend.extraVolumeMounts "context" $) | nindent 12 }}
{{- end }}