rename adminPanel to dashboard and adminFrontend and adminBackend to frontend and backend. Fix JWT secrets

This commit is contained in:
Maarten de Waard 2021-10-05 16:39:47 +02:00
parent 18276be75d
commit 80c2f776d3
No known key found for this signature in database
GPG key ID: 1D3E893A657CC8DA
12 changed files with 268 additions and 258 deletions

View file

@ -10,16 +10,16 @@ dependencies:
version: 1.x.x version: 1.x.x
description: A Helm chart for deploying the Stackspin Dashboard to Kubernetes description: A Helm chart for deploying the Stackspin Dashboard to Kubernetes
engine: gotpl engine: gotpl
home: https://open.greenhost.net/openappstack/admin-frontend/ home: https://open.greenhost.net/openappstack/dashboard-frontend/
icon: https://open.greenhost.net/openappstack/admin-frontend/-/blob/master/public/assets/logo.svg icon: https://open.greenhost.net/openappstack/dashboard-frontend/-/blob/master/public/assets/logo.svg
keywords: keywords:
- stackspin - stackspin
- dashboard - dashboard
maintainers: maintainers:
- email: info@openappstack.net - email: info@openappstack.net
name: Stackspin name: Stackspin
name: admin-panel name: dashboard
sources: sources:
- https://open.greenhost.net/openappstack/admin-frontend/ - https://open.greenhost.net/openappstack/dashboard-frontend/
- https://open.greenhost.net/openappstack/admin-backend/ - https://open.greenhost.net/openappstack/dashboard-backend/
version: 0.1.0 version: 0.1.0

View file

@ -2,7 +2,7 @@
{{/* {{/*
Create the name of the service account to use Create the name of the service account to use
*/}} */}}
{{- define "adminPanel.serviceAccountName" -}} {{- define "dashboard.serviceAccountName" -}}
{{- if .Values.serviceAccount.create -}} {{- if .Values.serviceAccount.create -}}
{{ default (include "common.names.fullname" .) .Values.serviceAccount.name }} {{ default (include "common.names.fullname" .) .Values.serviceAccount.name }}
{{- else -}} {{- else -}}
@ -13,15 +13,15 @@ Create the name of the service account to use
{{/* {{/*
Return the proper Docker image registry secret names Return the proper Docker image registry secret names
*/}} */}}
{{- define "adminPanel.imagePullSecrets" -}} {{- define "dashboard.imagePullSecrets" -}}
{{ include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) }} {{ include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) }}
{{- end -}} {{- end -}}
{{/* {{/*
Return true if a secret object for Admin-frontend should be created Return true if a secret object for Admin-frontend should be created
*/}} */}}
{{- define "adminBackend.createSecret" -}} {{- define "backend.createSecret" -}}
{{- if or (not .Values.adminBackend.existingSecret) (and (not .Values.adminBackend.smtp.existingSecret) .Values.adminBackend.smtp.password .Values.adminBackend.smtp.enabled) }} {{- if or (not .Values.backend.existingSecret) (and (not .Values.backend.smtp.existingSecret) .Values.backend.smtp.password .Values.backend.smtp.enabled) }}
{{- true -}} {{- true -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
@ -29,30 +29,30 @@ Return true if a secret object for Admin-frontend should be created
{{/* {{/*
Return the Admin-backend secret name Return the Admin-backend secret name
*/}} */}}
{{- define "adminBackend.secretName" -}} {{- define "backend.secretName" -}}
{{- if .Values.adminBackend.existingSecret }} {{- if .Values.backend.existingSecret }}
{{- printf "%s" .Values.adminBackend.existingSecret -}} {{- printf "%s" .Values.backend.existingSecret -}}
{{- else -}} {{- else -}}
{{- printf "%s-admin-backend" (include "common.names.fullname" .) -}} {{- printf "%s-backend" (include "common.names.fullname" .) -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{/* {{/*
Return the Admin-backend SMTP secret name Return the Admin-backend SMTP secret name
*/}} */}}
{{- define "adminBackend.smtp.secretName" -}} {{- define "backend.smtp.secretName" -}}
{{- if .Values.adminBackend.smtp.existingSecret }} {{- if .Values.backend.smtp.existingSecret }}
{{- printf "%s" .Values.adminBackend.smtp.existingSecret -}} {{- printf "%s" .Values.backend.smtp.existingSecret -}}
{{- else -}} {{- else -}}
{{- printf "%s-admin-backend" (include "common.names.fullname" .) -}} {{- printf "%s-backend" (include "common.names.fullname" .) -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{/* {{/*
Return true if Admin-backend SMTP uses password authentication Return true if Admin-backend SMTP uses password authentication
*/}} */}}
{{- define "adminBackend.smtp.password.enabled" -}} {{- define "backend.smtp.password.enabled" -}}
{{- if and (or .Values.adminBackend.smtp.password .Values.adminBackend.smtp.existingSecret) .Values.adminBackend.smtp.enabled }} {{- if and (or .Values.backend.smtp.password .Values.backend.smtp.existingSecret) .Values.backend.smtp.enabled }}
{{- true -}} {{- true -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
@ -61,11 +61,11 @@ Return true if Admin-backend SMTP uses password authentication
Get the user defined LoadBalancerIP for this release Get the user defined LoadBalancerIP for this release
Note, returns 127.0.0.1 if using ClusterIP. Note, returns 127.0.0.1 if using ClusterIP.
*/}} */}}
{{- define "adminFrontend.serviceIP" -}} {{- define "frontend.serviceIP" -}}
{{- if eq .Values.adminFrontend.service.type "ClusterIP" -}} {{- if eq .Values.frontend.service.type "ClusterIP" -}}
127.0.0.1 127.0.0.1
{{- else -}} {{- else -}}
{{- .Values.adminFrontend.service.loadBalancerIP | default "" -}} {{- .Values.frontend.service.loadBalancerIP | default "" -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
@ -73,22 +73,22 @@ Note, returns 127.0.0.1 if using ClusterIP.
Gets the host to be used for this application. 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 If not using ClusterIP, or if a host or LoadBalancerIP is not defined, the value will be empty
*/}} */}}
{{- define "adminFrontend.host" -}} {{- define "frontend.host" -}}
{{- $host := .Values.adminFrontend.host | default "" -}} {{- $host := .Values.frontend.host | default "" -}}
{{- default (include "adminFrontend.serviceIP" .) $host -}} {{- default (include "frontend.serviceIP" .) $host -}}
{{- end -}} {{- end -}}
{{/* {{/*
Service name for the backend service Service name for the backend service
*/}} */}}
{{- define "adminBackend.serviceName" -}} {{- define "backend.serviceName" -}}
{{ include "common.names.fullname" . }}-backend {{ include "common.names.fullname" . }}-backend
{{- end -}} {{- end -}}
{{/* {{/*
Service name for the frontend service Service name for the frontend service
*/}} */}}
{{- define "adminFrontend.serviceName" -}} {{- define "frontend.serviceName" -}}
{{ include "common.names.fullname" . }}-frontend {{ include "common.names.fullname" . }}-frontend
{{- end -}} {{- end -}}
@ -96,11 +96,11 @@ Service name for the frontend service
Get the user defined LoadBalancerIP for this release Get the user defined LoadBalancerIP for this release
Note, returns 127.0.0.1 if using ClusterIP. Note, returns 127.0.0.1 if using ClusterIP.
*/}} */}}
{{- define "adminBackend.serviceIP" -}} {{- define "backend.serviceIP" -}}
{{- if eq .Values.adminBackend.service.type "ClusterIP" -}} {{- if eq .Values.backend.service.type "ClusterIP" -}}
127.0.0.1 127.0.0.1
{{- else -}} {{- else -}}
{{- .Values.adminBackend.service.loadBalancerIP | default "" -}} {{- .Values.backend.service.loadBalancerIP | default "" -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
@ -108,27 +108,27 @@ Note, returns 127.0.0.1 if using ClusterIP.
Gets the host to be used for this application. 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 If not using ClusterIP, or if a host or LoadBalancerIP is not defined, the value will be empty
*/}} */}}
{{- define "adminBackend.host" -}} {{- define "backend.host" -}}
{{- $host := .Values.adminBackend.host | default "" -}} {{- $host := .Values.backend.host | default "" -}}
{{- default (include "adminBackend.serviceIP" .) $host -}} {{- default (include "backend.serviceIP" .) $host -}}
{{- end -}} {{- end -}}
{{/* {{/*
Return the proper Admin-frontend image name Return the proper Admin-frontend image name
*/}} */}}
{{- define "adminFrontend.image" -}} {{- define "frontend.image" -}}
{{ include "common.images.image" (dict "imageRoot" .Values.adminFrontend.image "global" .Values.global) }} {{ include "common.images.image" (dict "imageRoot" .Values.frontend.image "global" .Values.global) }}
{{- end -}} {{- end -}}
{{/* {{/*
Return the proper Admin-backend image name Return the proper Admin-backend image name
*/}} */}}
{{- define "adminBackend.image" -}} {{- define "backend.image" -}}
{{ include "common.images.image" (dict "imageRoot" .Values.adminBackend.image "global" .Values.global) }} {{ include "common.images.image" (dict "imageRoot" .Values.backend.image "global" .Values.global) }}
{{- end -}} {{- end -}}
{{/* {{/*
Return the proper Storage Class Return the proper Storage Class
*/}} */}}
{{- define "adminPanel.storageClass" -}} {{- define "dashboard.storageClass" -}}
{{- include "common.storage.class" (dict "persistence" .Values.persistence "global" .Values.global) -}} {{- include "common.storage.class" (dict "persistence" .Values.persistence "global" .Values.global) -}}
{{- end -}} {{- end -}}

View file

@ -1,42 +1,42 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{ include "adminBackend.serviceName" . }} name: {{ include "backend.serviceName" . }}
labels: {{- include "common.labels.standard" . | nindent 4 }} labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- if .Values.commonLabels }} {{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
{{- if or .Values.adminBackend.service.annotations .Values.commonAnnotations}} {{- if or .Values.backend.service.annotations .Values.commonAnnotations}}
annotations: annotations:
{{- if .Values.adminBackend.service.annotations }} {{- if .Values.backend.service.annotations }}
{{- include "common.tplvalues.render" (dict "value" .Values.adminBackend.service.annotations "context" $) | nindent 4 }} {{- include "common.tplvalues.render" (dict "value" .Values.backend.service.annotations "context" $) | nindent 4 }}
{{- end }} {{- end }}
{{- if .Values.commonAnnotations }} {{- if .Values.commonAnnotations }}
{{- include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }} {{- include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }}
{{- end }} {{- end }}
{{- end }} {{- end }}
spec: spec:
type: {{ .Values.adminBackend.service.type }} type: {{ .Values.backend.service.type }}
{{- if (or (eq .Values.adminBackend.service.type "LoadBalancer") (eq .Values.adminBackend.service.type "NodePort")) }} {{- if (or (eq .Values.backend.service.type "LoadBalancer") (eq .Values.backend.service.type "NodePort")) }}
externalTrafficPolicy: {{ .Values.adminBackend.service.externalTrafficPolicy | quote }} externalTrafficPolicy: {{ .Values.backend.service.externalTrafficPolicy | quote }}
{{- end }} {{- end }}
{{- if (and (eq .Values.adminBackend.service.type "LoadBalancer") (not (empty .Values.adminBackend.service.loadBalancerIP))) }} {{- if (and (eq .Values.backend.service.type "LoadBalancer") (not (empty .Values.backend.service.loadBalancerIP))) }}
loadBalancerIP: {{ .Values.adminBackend.service.loadBalancerIP }} loadBalancerIP: {{ .Values.backend.service.loadBalancerIP }}
{{- end }} {{- end }}
{{- if (and (eq .Values.adminBackend.service.type "LoadBalancer") .Values.adminBackend.service.loadBalancerSourceRanges) }} {{- if (and (eq .Values.backend.service.type "LoadBalancer") .Values.backend.service.loadBalancerSourceRanges) }}
loadBalancerSourceRanges: loadBalancerSourceRanges:
{{ toYaml .Values.adminBackend.service.loadBalancerSourceRanges | nindent 4 }} {{ toYaml .Values.backend.service.loadBalancerSourceRanges | nindent 4 }}
{{- end }} {{- end }}
ports: ports:
- name: http - name: http
port: {{ .Values.adminBackend.service.port }} port: {{ .Values.backend.service.port }}
targetPort: backend-http targetPort: backend-http
{{- if (and (or (eq .Values.adminBackend.service.type "NodePort") (eq .Values.adminBackend.service.type "LoadBalancer")) (not (empty .Values.adminBackend.service.nodePorts.http))) }} {{- if (and (or (eq .Values.backend.service.type "NodePort") (eq .Values.backend.service.type "LoadBalancer")) (not (empty .Values.backend.service.nodePorts.http))) }}
nodePort: {{ .Values.adminBackend.service.nodePorts.http }} nodePort: {{ .Values.backend.service.nodePorts.http }}
{{- else if eq .Values.adminBackend.service.type "ClusterIP" }} {{- else if eq .Values.backend.service.type "ClusterIP" }}
nodePort: null nodePort: null
{{- end }} {{- end }}
{{- if .Values.adminBackend.service.extraPorts }} {{- if .Values.backend.service.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.adminBackend.service.extraPorts "context" $) | nindent 4 }} {{- include "common.tplvalues.render" (dict "value" .Values.backend.service.extraPorts "context" $) | nindent 4 }}
{{- end }} {{- end }}
selector: {{- include "common.labels.matchLabels" . | nindent 4 }} selector: {{- include "common.labels.matchLabels" . | nindent 4 }}

View file

@ -10,21 +10,24 @@ metadata:
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
data: data:
# ADMIN_FRONTEND_HOST: "{{ include "adminFrontend.host" . }}" SECRET_KEY: {{ .Values.backend.secretKey }}
# ADMIN_BACKEND_HOST: "{{ include "adminBackend.host" . }}" 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: # Probably needed in the future:
# ADMIN_BACKEND_USERNAME: {{ .Values.adminBackend.username | quote }} # ADMIN_BACKEND_USERNAME: {{ .Values.backend.username | quote }}
# ADMIN_BACKEND_EMAIL: {{ .Values.adminBackend.email | quote }} # ADMIN_BACKEND_EMAIL: {{ .Values.backend.email | quote }}
# {{- if .Values.adminBackend.smtp.enabled }} # {{- if .Values.backend.smtp.enabled }}
# ADMIN_BACKEND_SMTP_HOST: {{ .Values.adminBackend.smtp.host | quote }} # ADMIN_BACKEND_SMTP_HOST: {{ .Values.backend.smtp.host | quote }}
# ADMIN_BACKEND_SMTP_PORT: {{ .Values.adminBackend.smtp.port | quote }} # ADMIN_BACKEND_SMTP_PORT: {{ .Values.backend.smtp.port | quote }}
# {{- if .Values.adminBackend.smtp.user }} # {{- if .Values.backend.smtp.user }}
# ADMIN_BACKEND_SMTP_USER: {{ .Values.adminBackend.smtp.user | quote }} # ADMIN_BACKEND_SMTP_USER: {{ .Values.backend.smtp.user | quote }}
# {{- end }} # {{- end }}
# {{- if .Values.adminBackend.smtp.protocol }} # {{- if .Values.backend.smtp.protocol }}
# ADMIN_BACKEND_SMTP_PROTOCOL: {{ .Values.adminBackend.smtp.protocol | quote }} # ADMIN_BACKEND_SMTP_PROTOCOL: {{ .Values.backend.smtp.protocol | quote }}
# {{- end }} # {{- end }}
# {{- if .Values.adminBackend.smtp.auth }} # {{- if .Values.backend.smtp.auth }}
# ADMIN_BACKEND_SMTP_AUTH: {{ .Values.adminBackend.smtp.auth | quote }} # ADMIN_BACKEND_SMTP_AUTH: {{ .Values.backend.smtp.auth | quote }}
# {{- end }} # {{- end }}
# {{- end }} # {{- end }}

View file

@ -1,10 +1,10 @@
{{- if include "adminFrontend.host" . -}} {{- if include "frontend.host" . -}}
apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }} apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }}
kind: Deployment kind: Deployment
metadata: metadata:
name: {{ template "common.names.fullname" . }} name: {{ template "common.names.fullname" . }}
labels: {{- include "common.labels.standard" . | nindent 4 }} labels: {{- include "common.labels.standard" . | nindent 4 }}
component: adminPanel component: dashboard
{{- if .Values.commonLabels }} {{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
@ -15,14 +15,14 @@ spec:
replicas: {{ .Values.replicaCount }} replicas: {{ .Values.replicaCount }}
selector: selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
component: adminPanel component: dashboard
{{- if .Values.updateStrategy }} {{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }} {{- end }}
template: template:
metadata: metadata:
labels: {{- include "common.labels.standard" . | nindent 8 }} labels: {{- include "common.labels.standard" . | nindent 8 }}
component: adminPanel component: dashboard
{{- if .Values.podLabels }} {{- if .Values.podLabels }}
{{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }} {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
{{- end }} {{- end }}
@ -30,7 +30,7 @@ spec:
annotations: {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }} annotations: {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
{{- end }} {{- end }}
spec: spec:
{{- include "adminPanel.imagePullSecrets" . | nindent 6 }} {{- include "dashboard.imagePullSecrets" . | nindent 6 }}
{{- if .Values.hostAliases }} {{- if .Values.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }} hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }}
{{- end }} {{- end }}
@ -48,148 +48,148 @@ spec:
{{- if .Values.tolerations }} {{- if .Values.tolerations }}
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.tolerations "context" $) | nindent 8 }} tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.tolerations "context" $) | nindent 8 }}
{{- end }} {{- end }}
serviceAccountName: {{ include "adminPanel.serviceAccountName" . }} serviceAccountName: {{ include "dashboard.serviceAccountName" . }}
securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }}
initContainers: initContainers:
{{- if .Values.initContainers }} {{- if .Values.initContainers }}
{{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} {{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
{{- end }} {{- end }}
containers: containers:
- name: admin-frontend - name: frontend
securityContext: {{- toYaml .Values.adminFrontend.containerSecurityContext | nindent 12 }} securityContext: {{- toYaml .Values.frontend.containerSecurityContext | nindent 12 }}
image: {{ template "adminFrontend.image" . }} image: {{ template "frontend.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy | quote }} imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
{{- if .Values.adminFrontend.command }} {{- if .Values.frontend.command }}
command: {{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.command "context" $) | nindent 12 }} command: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.command "context" $) | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.adminFrontend.args }} {{- if .Values.frontend.args }}
args: {{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.args "context" $) | nindent 12 }} args: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.args "context" $) | nindent 12 }}
{{- end }} {{- end }}
env: env:
{{- if .Values.adminFrontend.extraEnvVars }} {{- if .Values.frontend.extraEnvVars }}
{{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.extraEnvVars "context" $) | nindent 12 }} {{- include "common.tplvalues.render" (dict "value" .Values.frontend.extraEnvVars "context" $) | nindent 12 }}
{{- end }} {{- end }}
envFrom: envFrom:
- configMapRef: - configMapRef:
name: {{ include "common.names.fullname" . }} name: {{ include "common.names.fullname" . }}
{{- if .Values.adminFrontend.extraEnvVarsCM }} {{- if .Values.frontend.extraEnvVarsCM }}
- configMapRef: - configMapRef:
name: {{ .Values.adminFrontend.extraEnvVarsCM }} name: {{ .Values.frontend.extraEnvVarsCM }}
{{- end }} {{- end }}
{{- if .Values.adminFrontend.extraEnvVarsSecret }} {{- if .Values.frontend.extraEnvVarsSecret }}
- secretRef: - secretRef:
name: {{ .Values.adminFrontend.extraEnvVarsSecret }} name: {{ .Values.frontend.extraEnvVarsSecret }}
{{- end }} {{- end }}
ports: ports:
- name: frontend-http - name: frontend-http
containerPort: 80 containerPort: 80
protocol: TCP protocol: TCP
{{- if .Values.adminFrontend.livenessProbe.enabled }} {{- if .Values.frontend.livenessProbe.enabled }}
livenessProbe: livenessProbe:
httpGet: httpGet:
path: / path: /
port: frontend-http port: frontend-http
initialDelaySeconds: {{ .Values.adminFrontend.livenessProbe.initialDelaySeconds }} initialDelaySeconds: {{ .Values.frontend.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.adminFrontend.livenessProbe.periodSeconds }} periodSeconds: {{ .Values.frontend.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.adminFrontend.livenessProbe.timeoutSeconds }} timeoutSeconds: {{ .Values.frontend.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.adminFrontend.livenessProbe.successThreshold }} successThreshold: {{ .Values.frontend.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.adminFrontend.livenessProbe.failureThreshold }} failureThreshold: {{ .Values.frontend.livenessProbe.failureThreshold }}
{{- else if .Values.adminFrontend.customLivenessProbe }} {{- else if .Values.frontend.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.customLivenessProbe "context" $) | nindent 12 }} livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.customLivenessProbe "context" $) | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.adminFrontend.readinessProbe.enabled }} {{- if .Values.frontend.readinessProbe.enabled }}
readinessProbe: readinessProbe:
httpGet: httpGet:
path: / path: /
port: frontend-http port: frontend-http
initialDelaySeconds: {{ .Values.adminFrontend.readinessProbe.initialDelaySeconds }} initialDelaySeconds: {{ .Values.frontend.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.adminFrontend.readinessProbe.periodSeconds }} periodSeconds: {{ .Values.frontend.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.adminFrontend.readinessProbe.timeoutSeconds }} timeoutSeconds: {{ .Values.frontend.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.adminFrontend.readinessProbe.successThreshold }} successThreshold: {{ .Values.frontend.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.adminFrontend.readinessProbe.failureThreshold }} failureThreshold: {{ .Values.frontend.readinessProbe.failureThreshold }}
{{- else if .Values.adminFrontend.customReadinessProbe }} {{- else if .Values.frontend.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.customReadinessProbe "context" $) | nindent 12 }} readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.customReadinessProbe "context" $) | nindent 12 }}
{{- end }} {{- end }}
volumeMounts: volumeMounts:
{{- if .Values.adminFrontend.extraVolumeMounts }} {{- if .Values.frontend.extraVolumeMounts }}
{{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.extraVolumeMounts "context" $) | nindent 12 }} {{- include "common.tplvalues.render" (dict "value" .Values.frontend.extraVolumeMounts "context" $) | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.adminFrontend.resources }} {{- if .Values.frontend.resources }}
resources: {{- toYaml .Values.adminFrontend.resources | nindent 12 }} resources: {{- toYaml .Values.frontend.resources | nindent 12 }}
{{- end }} {{- end }}
- name: admin-backend - name: backend
securityContext: {{- toYaml .Values.adminBackend.containerSecurityContext | nindent 12 }} securityContext: {{- toYaml .Values.backend.containerSecurityContext | nindent 12 }}
image: {{ template "adminBackend.image" . }} image: {{ template "backend.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy | quote }} imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
{{- if .Values.adminBackend.command }} {{- if .Values.backend.command }}
command: {{- include "common.tplvalues.render" (dict "value" .Values.adminBackend.command "context" $) | nindent 12 }} command: {{- include "common.tplvalues.render" (dict "value" .Values.backend.command "context" $) | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.adminBackend.args }} {{- if .Values.backend.args }}
args: {{- include "common.tplvalues.render" (dict "value" .Values.adminBackend.args "context" $) | nindent 12 }} args: {{- include "common.tplvalues.render" (dict "value" .Values.backend.args "context" $) | nindent 12 }}
{{- end }} {{- end }}
env: env:
- name: ADMIN_PANEL_PASSWORD - name: ADMIN_PANEL_PASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ include "adminBackend.secretName" . }} name: {{ include "backend.secretName" . }}
key: adminBackend-password key: backend-password
{{- if (include "adminBackend.smtp.password.enabled" .) }} {{- if (include "backend.smtp.password.enabled" .) }}
- name: ADMIN_PANEL_SMTP_PASSWORD - name: ADMIN_PANEL_SMTP_PASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ include "adminBackend.smtp.secretName" . }} name: {{ include "backend.smtp.secretName" . }}
key: smtp-password key: smtp-password
{{- end }} {{- end }}
{{- if .Values.adminBackend.extraEnvVars }} {{- if .Values.backend.extraEnvVars }}
{{- include "common.tplvalues.render" (dict "value" .Values.adminBackend.extraEnvVars "context" $) | nindent 12 }} {{- include "common.tplvalues.render" (dict "value" .Values.backend.extraEnvVars "context" $) | nindent 12 }}
{{- end }} {{- end }}
envFrom: envFrom:
- configMapRef: - configMapRef:
name: {{ include "common.names.fullname" . }} name: {{ include "common.names.fullname" . }}
{{- if .Values.adminBackend.extraEnvVarsCM }} {{- if .Values.backend.extraEnvVarsCM }}
- configMapRef: - configMapRef:
name: {{ .Values.adminBackend.extraEnvVarsCM }} name: {{ .Values.backend.extraEnvVarsCM }}
{{- end }} {{- end }}
{{- if .Values.adminBackend.extraEnvVarsSecret }} {{- if .Values.backend.extraEnvVarsSecret }}
- secretRef: - secretRef:
name: {{ .Values.adminBackend.extraEnvVarsSecret }} name: {{ .Values.backend.extraEnvVarsSecret }}
{{- end }} {{- end }}
ports: ports:
- name: backend-http - name: backend-http
containerPort: 5000 containerPort: 5000
protocol: TCP protocol: TCP
{{- if .Values.adminBackend.livenessProbe.enabled }} {{- if .Values.backend.livenessProbe.enabled }}
livenessProbe: livenessProbe:
httpGet: httpGet:
path: / path: /
port: backend-http port: backend-http
initialDelaySeconds: {{ .Values.adminBackend.livenessProbe.initialDelaySeconds }} initialDelaySeconds: {{ .Values.backend.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.adminBackend.livenessProbe.periodSeconds }} periodSeconds: {{ .Values.backend.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.adminBackend.livenessProbe.timeoutSeconds }} timeoutSeconds: {{ .Values.backend.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.adminBackend.livenessProbe.successThreshold }} successThreshold: {{ .Values.backend.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.adminBackend.livenessProbe.failureThreshold }} failureThreshold: {{ .Values.backend.livenessProbe.failureThreshold }}
{{- else if .Values.adminBackend.customLivenessProbe }} {{- else if .Values.backend.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.adminBackend.customLivenessProbe "context" $) | nindent 12 }} livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.backend.customLivenessProbe "context" $) | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.adminBackend.readinessProbe.enabled }} {{- if .Values.backend.readinessProbe.enabled }}
readinessProbe: readinessProbe:
httpGet: httpGet:
path: / path: /
port: backend-http port: backend-http
initialDelaySeconds: {{ .Values.adminBackend.readinessProbe.initialDelaySeconds }} initialDelaySeconds: {{ .Values.backend.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.adminBackend.readinessProbe.periodSeconds }} periodSeconds: {{ .Values.backend.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.adminBackend.readinessProbe.timeoutSeconds }} timeoutSeconds: {{ .Values.backend.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.adminBackend.readinessProbe.successThreshold }} successThreshold: {{ .Values.backend.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.adminBackend.readinessProbe.failureThreshold }} failureThreshold: {{ .Values.backend.readinessProbe.failureThreshold }}
{{- else if .Values.adminBackend.customReadinessProbe }} {{- else if .Values.backend.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.adminBackend.customReadinessProbe "context" $) | nindent 12 }} readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.backend.customReadinessProbe "context" $) | nindent 12 }}
{{- end }} {{- end }}
volumeMounts: volumeMounts:
{{- if .Values.adminBackend.extraVolumeMounts }} {{- if .Values.backend.extraVolumeMounts }}
{{- include "common.tplvalues.render" (dict "value" .Values.adminBackend.extraVolumeMounts "context" $) | nindent 12 }} {{- include "common.tplvalues.render" (dict "value" .Values.backend.extraVolumeMounts "context" $) | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.adminBackend.resources }} {{- if .Values.backend.resources }}
resources: {{- toYaml .Values.adminBackend.resources | nindent 12 }} resources: {{- toYaml .Values.backend.resources | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.sidecars }} {{- if .Values.sidecars }}
{{- include "common.tplvalues.render" (dict "value" .Values.sidecars "context" $) | nindent 8 }} {{- include "common.tplvalues.render" (dict "value" .Values.sidecars "context" $) | nindent 8 }}

View file

@ -1,42 +1,42 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{ include "adminFrontend.serviceName" . }} name: {{ include "frontend.serviceName" . }}
labels: {{- include "common.labels.standard" . | nindent 4 }} labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- if .Values.commonLabels }} {{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
{{- if or .Values.adminFrontend.service.annotations .Values.commonAnnotations}} {{- if or .Values.frontend.service.annotations .Values.commonAnnotations}}
annotations: annotations:
{{- if .Values.adminFrontend.service.annotations }} {{- if .Values.frontend.service.annotations }}
{{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.service.annotations "context" $) | nindent 4 }} {{- include "common.tplvalues.render" (dict "value" .Values.frontend.service.annotations "context" $) | nindent 4 }}
{{- end }} {{- end }}
{{- if .Values.commonAnnotations }} {{- if .Values.commonAnnotations }}
{{- include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }} {{- include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }}
{{- end }} {{- end }}
{{- end }} {{- end }}
spec: spec:
type: {{ .Values.adminFrontend.service.type }} type: {{ .Values.frontend.service.type }}
{{- if (or (eq .Values.adminFrontend.service.type "LoadBalancer") (eq .Values.adminFrontend.service.type "NodePort")) }} {{- if (or (eq .Values.frontend.service.type "LoadBalancer") (eq .Values.frontend.service.type "NodePort")) }}
externalTrafficPolicy: {{ .Values.adminFrontend.service.externalTrafficPolicy | quote }} externalTrafficPolicy: {{ .Values.frontend.service.externalTrafficPolicy | quote }}
{{- end }} {{- end }}
{{- if (and (eq .Values.adminFrontend.service.type "LoadBalancer") (not (empty .Values.adminFrontend.service.loadBalancerIP))) }} {{- if (and (eq .Values.frontend.service.type "LoadBalancer") (not (empty .Values.frontend.service.loadBalancerIP))) }}
loadBalancerIP: {{ .Values.adminFrontend.service.loadBalancerIP }} loadBalancerIP: {{ .Values.frontend.service.loadBalancerIP }}
{{- end }} {{- end }}
{{- if (and (eq .Values.adminFrontend.service.type "LoadBalancer") .Values.adminFrontend.service.loadBalancerSourceRanges) }} {{- if (and (eq .Values.frontend.service.type "LoadBalancer") .Values.frontend.service.loadBalancerSourceRanges) }}
loadBalancerSourceRanges: loadBalancerSourceRanges:
{{ toYaml .Values.adminFrontend.service.loadBalancerSourceRanges | nindent 4 }} {{ toYaml .Values.frontend.service.loadBalancerSourceRanges | nindent 4 }}
{{- end }} {{- end }}
ports: ports:
- name: http - name: http
port: {{ .Values.adminFrontend.service.port }} port: {{ .Values.frontend.service.port }}
targetPort: frontend-http targetPort: frontend-http
{{- if (and (or (eq .Values.adminFrontend.service.type "NodePort") (eq .Values.adminFrontend.service.type "LoadBalancer")) (not (empty .Values.adminFrontend.service.nodePorts.http))) }} {{- if (and (or (eq .Values.frontend.service.type "NodePort") (eq .Values.frontend.service.type "LoadBalancer")) (not (empty .Values.frontend.service.nodePorts.http))) }}
nodePort: {{ .Values.adminFrontend.service.nodePorts.http }} nodePort: {{ .Values.frontend.service.nodePorts.http }}
{{- else if eq .Values.adminFrontend.service.type "ClusterIP" }} {{- else if eq .Values.frontend.service.type "ClusterIP" }}
nodePort: null nodePort: null
{{- end }} {{- end }}
{{- if .Values.adminFrontend.service.extraPorts }} {{- if .Values.frontend.service.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.adminFrontend.service.extraPorts "context" $) | nindent 4 }} {{- include "common.tplvalues.render" (dict "value" .Values.frontend.service.extraPorts "context" $) | nindent 4 }}
{{- end }} {{- end }}
selector: {{- include "common.labels.matchLabels" . | nindent 4 }} selector: {{- include "common.labels.matchLabels" . | nindent 4 }}

View file

@ -40,13 +40,13 @@ spec:
{{- if eq "true" (include "common.ingress.supportsPathType" .) }} {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
pathType: {{ .Values.ingress.pathType }} pathType: {{ .Values.ingress.pathType }}
{{- end }} {{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "adminFrontend.serviceName" .) "servicePort" "frontend-http" "context" $) | nindent 14 }} backend: {{- include "common.ingress.backend" (dict "serviceName" (include "frontend.serviceName" .) "servicePort" "frontend-http" "context" $) | nindent 14 }}
# Forward API calls to the back-end container # Forward API calls to the back-end container
- path: {{ .Values.ingress.path }}api/v1 - path: {{ .Values.ingress.path }}api/v1
{{- if eq "true" (include "common.ingress.supportsPathType" .) }} {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
pathType: {{ .Values.ingress.pathType }} pathType: {{ .Values.ingress.pathType }}
{{- end }} {{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "adminBackend.serviceName" .) "servicePort" "backend-http" "context" $) | nindent 14 }} backend: {{- include "common.ingress.backend" (dict "serviceName" (include "backend.serviceName" .) "servicePort" "backend-http" "context" $) | nindent 14 }}
{{- end }} {{- end }}
{{- range .Values.ingress.extraHosts }} {{- range .Values.ingress.extraHosts }}
- host: {{ .name }} - host: {{ .name }}
@ -56,11 +56,11 @@ spec:
{{- if eq "true" (include "common.ingress.supportsPathType" $) }} {{- if eq "true" (include "common.ingress.supportsPathType" $) }}
pathType: {{ default "ImplementationSpecific" .pathType }} pathType: {{ default "ImplementationSpecific" .pathType }}
{{- end }} {{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "adminFrontend.serviceName" $) "servicePort" "frontend-http" "context" $) | nindent 14 }} backend: {{- include "common.ingress.backend" (dict "serviceName" (include "frontend.serviceName" $) "servicePort" "frontend-http" "context" $) | nindent 14 }}
- path: {{ default "/" .path }}api/v1 - path: {{ default "/" .path }}api/v1
{{- if eq "true" (include "common.ingress.supportsPathType" $) }} {{- if eq "true" (include "common.ingress.supportsPathType" $) }}
pathType: {{ default "ImplementationSpecific" .pathType }} pathType: {{ default "ImplementationSpecific" .pathType }}
{{- end }} {{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "adminBackend.serviceName" .) "servicePort" "backend-http" "context" $) | nindent 14 }} backend: {{- include "common.ingress.backend" (dict "serviceName" (include "backend.serviceName" .) "servicePort" "backend-http" "context" $) | nindent 14 }}
{{- end }} {{- end }}
{{- end }} {{- end }}

View file

@ -1,5 +1,5 @@
# Disabled by default because the current admin panel does not need persistence # Disabled by default because the current dashboard does not need persistence
{{- if and (include "adminFrontend.host" .) .Values.persistence.enabled (not .Values.persistence.existingClaim) }} {{- if and (include "frontend.host" .) .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
kind: PersistentVolumeClaim kind: PersistentVolumeClaim
apiVersion: v1 apiVersion: v1
metadata: metadata:
@ -17,7 +17,7 @@ spec:
resources: resources:
requests: requests:
storage: {{ .Values.persistence.size | quote }} storage: {{ .Values.persistence.size | quote }}
{{ include "adminPanel.storageClass" . }} {{ include "dashboard.storageClass" . }}
{{- if .Values.persistence.selector }} {{- if .Values.persistence.selector }}
selector: {{- include "common.tplvalues.render" (dict "value" .Values.persistence.selector "context" $) | nindent 4 }} selector: {{- include "common.tplvalues.render" (dict "value" .Values.persistence.selector "context" $) | nindent 4 }}
{{- end -}} {{- end -}}

View file

@ -1,8 +1,8 @@
{{- if (include "adminBackend.createSecret" .) }} {{- if (include "backend.createSecret" .) }}
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: {{ include "adminBackend.secretName" . }} name: {{ include "backend.secretName" . }}
labels: {{- include "common.labels.standard" . | nindent 4 }} labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- if .Values.commonLabels }} {{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
@ -12,12 +12,12 @@ metadata:
{{- end }} {{- end }}
type: Opaque type: Opaque
data: data:
{{- if and (.Values.adminBackend.password) (not .Values.adminBackend.existingSecret) }} {{- if and (.Values.backend.password) (not .Values.backend.existingSecret) }}
adminBackend-password: {{ .Values.adminBackend.password | b64enc | quote }} backend-password: {{ .Values.backend.password | b64enc | quote }}
{{- else if not .Values.adminBackend.existingSecret }} {{- else if not .Values.backend.existingSecret }}
adminBackend-password: {{ randAlphaNum 10 | b64enc | quote }} backend-password: {{ randAlphaNum 10 | b64enc | quote }}
{{- end }} {{- end }}
{{- if and (.Values.adminBackend.smtp.password) (.Values.adminBackend.smtp.enabled) (not .Values.adminBackend.smtp.existingSecret) }} {{- if and (.Values.backend.smtp.password) (.Values.backend.smtp.enabled) (not .Values.backend.smtp.existingSecret) }}
smtp-password: {{ .Values.adminBackend.smtp.password | b64enc | quote }} smtp-password: {{ .Values.backend.smtp.password | b64enc | quote }}
{{- end }} {{- end }}
{{- end }} {{- end }}

View file

@ -2,7 +2,7 @@
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: {{ include "adminPanel.serviceAccountName" . }} name: {{ include "dashboard.serviceAccountName" . }}
labels: {{- include "common.labels.standard" . | nindent 4 }} labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- if .Values.commonLabels }} {{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}

View file

@ -1,4 +1,4 @@
adminFrontend: frontend:
host: dashboard.oas-test2.maartendewaard.nl host: dashboard.oas-test2.maartendewaard.nl
livenessProbe: livenessProbe:
enabled: false enabled: false
@ -7,7 +7,8 @@ adminFrontend:
image: image:
tag: 2-add-helm-chart tag: 2-add-helm-chart
adminBackend: backend:
secretKey: tnsreaiotnau48pl329aftnreisaed
livenessProbe: livenessProbe:
enabled: false enabled: false
readinessProbe: readinessProbe:

View file

@ -21,10 +21,10 @@ global:
## @param kubeVersion Force target Kubernetes version (using Helm capabilities if not set) ## @param kubeVersion Force target Kubernetes version (using Helm capabilities if not set)
## ##
kubeVersion: "" kubeVersion: ""
## @param nameOverride String to partially override adminPanel.fullname template (will maintain the release name) ## @param nameOverride String to partially override dashboard.fullname template (will maintain the release name)
## ##
nameOverride: "" nameOverride: ""
## @param fullnameOverride String to fully override adminPanel.fullname template ## @param fullnameOverride String to fully override dashboard.fullname template
## ##
fullnameOverride: "" fullnameOverride: ""
## @param commonLabels Labels to be added to all deployed resources ## @param commonLabels Labels to be added to all deployed resources
@ -44,11 +44,11 @@ image:
imagePullSecrets: [] imagePullSecrets: []
## Admin frontend configuration parameters ## Admin frontend configuration parameters
## ref: https://open.greenhost.net/openappstack/admin-frontend ## ref: https://open.greenhost.net/openappstack/dashboard-frontend
## ##
adminFrontend: frontend:
## Admin frontend image version ## Admin frontend image version
## ref: https://hub.docker.com/r/bitnami/adminFrontend/tags/ ## ref: https://hub.docker.com/r/bitnami/frontend/tags/
## @param image.registry Discourse image registry ## @param image.registry Discourse image registry
## @param image.repository Discourse image repository ## @param image.repository Discourse image repository
## @param image.tag Discourse image tag ## @param image.tag Discourse image tag
@ -111,18 +111,18 @@ adminFrontend:
## ##
nodePorts: nodePorts:
http: "" http: ""
## @param adminFrontend.extendEslint Whether to read .eslint.json rules ## @param frontend.extendEslint Whether to read .eslint.json rules
extendEslint: false extendEslint: false
## @param adminFrontend.host Discourse host to create application URLs (include the port if =/= 80) ## @param frontend.host Discourse host to create application URLs (include the port if =/= 80)
## ##
host: "" host: ""
## @param adminFrontend.command Custom command to override image cmd ## @param frontend.command Custom command to override image cmd
## ##
command: [] command: []
## @param adminFrontend.args Custom args for the custom command ## @param frontend.args Custom args for the custom command
## ##
args: [] args: []
## @param adminFrontend.containerSecurityContext Container security context specification ## @param frontend.containerSecurityContext Container security context specification
## Example: ## Example:
## capabilities: ## capabilities:
## drop: ## drop:
@ -138,8 +138,8 @@ adminFrontend:
## choice for the user. This also increases chances charts run on environments with little ## choice for the user. This also increases chances charts run on environments with little
## resources, such as Minikube. If you do want to specify resources, uncomment the following ## resources, such as Minikube. If you do want to specify resources, uncomment the following
## lines, adjust them as necessary, and remove the curly braces after 'resources:'. ## lines, adjust them as necessary, and remove the curly braces after 'resources:'.
## @param adminFrontend.resources.limits The resources limits for the container ## @param frontend.resources.limits The resources limits for the container
## @param adminFrontend.resources.requests The requested resources for the container ## @param frontend.resources.requests The requested resources for the container
## ##
resources: resources:
## Example: ## Example:
@ -156,12 +156,12 @@ adminFrontend:
## WARNING: Discourse installation process may take up some time and ## WARNING: Discourse installation process may take up some time and
## setting inappropriate values here may lead to pods failure. ## setting inappropriate values here may lead to pods failure.
## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
## @param adminFrontend.livenessProbe.enabled Enable/disable livenessProbe ## @param frontend.livenessProbe.enabled Enable/disable livenessProbe
## @param adminFrontend.livenessProbe.initialDelaySeconds Delay before liveness probe is initiated ## @param frontend.livenessProbe.initialDelaySeconds Delay before liveness probe is initiated
## @param adminFrontend.livenessProbe.periodSeconds How often to perform the probe ## @param frontend.livenessProbe.periodSeconds How often to perform the probe
## @param adminFrontend.livenessProbe.timeoutSeconds When the probe times out ## @param frontend.livenessProbe.timeoutSeconds When the probe times out
## @param adminFrontend.livenessProbe.failureThreshold Minimum consecutive failures for the probe ## @param frontend.livenessProbe.failureThreshold Minimum consecutive failures for the probe
## @param adminFrontend.livenessProbe.successThreshold Minimum consecutive successes for the probe ## @param frontend.livenessProbe.successThreshold Minimum consecutive successes for the probe
## ##
livenessProbe: livenessProbe:
enabled: true enabled: true
@ -174,12 +174,12 @@ adminFrontend:
## WARNING: Discourse installation process may take up some time and ## WARNING: Discourse installation process may take up some time and
## setting inappropriate values here may lead to pods failure. ## setting inappropriate values here may lead to pods failure.
## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
## @param adminFrontend.readinessProbe.enabled Enable/disable readinessProbe ## @param frontend.readinessProbe.enabled Enable/disable readinessProbe
## @param adminFrontend.readinessProbe.initialDelaySeconds Delay before readiness probe is initiated ## @param frontend.readinessProbe.initialDelaySeconds Delay before readiness probe is initiated
## @param adminFrontend.readinessProbe.periodSeconds How often to perform the probe ## @param frontend.readinessProbe.periodSeconds How often to perform the probe
## @param adminFrontend.readinessProbe.timeoutSeconds When the probe times out ## @param frontend.readinessProbe.timeoutSeconds When the probe times out
## @param adminFrontend.readinessProbe.failureThreshold Minimum consecutive failures for the probe ## @param frontend.readinessProbe.failureThreshold Minimum consecutive failures for the probe
## @param adminFrontend.readinessProbe.successThreshold Minimum consecutive successes for the probe ## @param frontend.readinessProbe.successThreshold Minimum consecutive successes for the probe
## ##
readinessProbe: readinessProbe:
enabled: true enabled: true
@ -188,27 +188,27 @@ adminFrontend:
timeoutSeconds: 5 timeoutSeconds: 5
failureThreshold: 6 failureThreshold: 6
successThreshold: 1 successThreshold: 1
## @param adminFrontend.customLivenessProbe Custom liveness probe to execute (when the main one is disabled) ## @param frontend.customLivenessProbe Custom liveness probe to execute (when the main one is disabled)
## ##
customLivenessProbe: {} customLivenessProbe: {}
## @param adminFrontend.customReadinessProbe Custom readiness probe to execute (when the main one is disabled) ## @param frontend.customReadinessProbe Custom readiness probe to execute (when the main one is disabled)
## ##
customReadinessProbe: {} customReadinessProbe: {}
## @param adminFrontend.extraEnvVars An array to add extra env vars ## @param frontend.extraEnvVars An array to add extra env vars
## For example: ## For example:
## extraEnvVars: ## extraEnvVars:
## adminFrontend: ## frontend:
## - name: ADMIN_PANEL_ELASTICSEARCH_URL ## - name: ADMIN_PANEL_ELASTICSEARCH_URL
## value: test ## value: test
## ##
extraEnvVars: [] extraEnvVars: []
## @param adminFrontend.extraEnvVarsCM Array to add extra configmaps ## @param frontend.extraEnvVarsCM Array to add extra configmaps
## ##
extraEnvVarsCM: [] extraEnvVarsCM: []
## @param adminFrontend.extraEnvVarsSecret Array to add extra environment variables from a secret ## @param frontend.extraEnvVarsSecret Array to add extra environment variables from a secret
## ##
extraEnvVarsSecret: "" extraEnvVarsSecret: ""
## @param adminFrontend.extraVolumeMounts Additional volume mounts (used along with `extraVolumes`) ## @param frontend.extraVolumeMounts Additional volume mounts (used along with `extraVolumes`)
## Example: Mount CA file ## Example: Mount CA file
## extraVolumeMounts ## extraVolumeMounts
## - name: ca-cert ## - name: ca-cert
@ -216,12 +216,12 @@ adminFrontend:
## mountPath: /path/to/ca_cert ## mountPath: /path/to/ca_cert
## ##
extraVolumeMounts: [] extraVolumeMounts: []
## Admin frontend configuration parameters ## Admin backend configuration parameters
## ref: https://open.greenhost.net/openappstack/admin-frontend ## ref: https://open.greenhost.net/openappstack/dashboard-backend
## ##
adminBackend: backend:
## Admin frontend image version ## Admin frontend image version
## ref: https://hub.docker.com/r/bitnami/adminFrontend/tags/ ## ref: https://hub.docker.com/r/bitnami/frontend/tags/
## @param image.registry Discourse image registry ## @param image.registry Discourse image registry
## @param image.repository Discourse image repository ## @param image.repository Discourse image repository
## @param image.tag Discourse image tag ## @param image.tag Discourse image tag
@ -285,36 +285,36 @@ adminBackend:
http: "" http: ""
## @param adminBackend.reactAppApiUrl URL to the admin-backend API ## @param backend.reactAppApiUrl URL to the dashboard-backend API
apiUrl: "/api/v1" apiUrl: "/api/v1"
## Variables for future use {{{ ## Variables for future use {{{
## @param adminBackend.username Admin user of the application ## @param backend.username Admin user of the application
## ##
username: user username: user
## @param adminBackend.password password. WARNING: Minimum length of 10 characters ## @param backend.password password. WARNING: Minimum length of 10 characters
## Defaults to a random 10-character alphanumeric string if not set ## Defaults to a random 10-character alphanumeric string if not set
## ##
password: "" password: ""
## @param adminBackend.existingSecret Name of an existing secret containing the password (ignores previous password) ## @param backend.existingSecret Name of an existing secret containing the password (ignores previous password)
## The secret should contain the following key: ## The secret should contain the following key:
## adminBackend-password ## backend-password
## ##
existingSecret: "" existingSecret: ""
## @param adminBackend.email Admin user email of the application ## @param backend.email Admin user email of the application
## ##
email: user@example.com email: user@example.com
## Admin panel SMTP settings ## Admin panel SMTP settings
## @param adminBackend.smtp.enabled Enable/disable SMTP ## @param backend.smtp.enabled Enable/disable SMTP
## @param adminBackend.smtp.host SMTP host name ## @param backend.smtp.host SMTP host name
## @param adminBackend.smtp.port SMTP port number ## @param backend.smtp.port SMTP port number
## @param adminBackend.smtp.user SMTP account user name ## @param backend.smtp.user SMTP account user name
## @param adminBackend.smtp.password SMTP account password ## @param backend.smtp.password SMTP account password
## @param adminBackend.smtp.protocol SMTP protocol (Allowed values: tls, ssl) ## @param backend.smtp.protocol SMTP protocol (Allowed values: tls, ssl)
## @param adminBackend.smtp.auth SMTP authentication method ## @param backend.smtp.auth SMTP authentication method
## @param adminBackend.smtp.existingSecret Name of an existing Kubernetes secret. The secret must have the following key configured: `smtp-password` ## @param backend.smtp.existingSecret Name of an existing Kubernetes secret. The secret must have the following key configured: `smtp-password`
## ##
smtp: smtp:
enabled: false enabled: false
@ -328,13 +328,19 @@ adminBackend:
## End variables for future use }}} ## End variables for future use }}}
## @param adminBackend.command Custom command to override image cmd ## @param backend.flaskEnv Overridable flask env for debugging
flaskEnv: production
## @param backend.secretKey Flask secret for generating JWT tokens
# secretKey: OVERRIDE_ME
## @param backend.command Custom command to override image cmd
## ##
command: [] command: []
## @param adminBackend.args Custom args for the custom command ## @param backend.args Custom args for the custom command
## ##
args: [] args: []
## @param adminBackend.containerSecurityContext Container security context specification ## @param backend.containerSecurityContext Container security context specification
## Example: ## Example:
## capabilities: ## capabilities:
## drop: ## drop:
@ -350,8 +356,8 @@ adminBackend:
## choice for the user. This also increases chances charts run on environments with little ## choice for the user. This also increases chances charts run on environments with little
## resources, such as Minikube. If you do want to specify resources, uncomment the following ## resources, such as Minikube. If you do want to specify resources, uncomment the following
## lines, adjust them as necessary, and remove the curly braces after 'resources:'. ## lines, adjust them as necessary, and remove the curly braces after 'resources:'.
## @param adminBackend.resources.limits The resources limits for the container ## @param backend.resources.limits The resources limits for the container
## @param adminBackend.resources.requests The requested resources for the container ## @param backend.resources.requests The requested resources for the container
## ##
resources: resources:
## Example: ## Example:
@ -368,12 +374,12 @@ adminBackend:
## WARNING: Discourse installation process may take up some time and ## WARNING: Discourse installation process may take up some time and
## setting inappropriate values here may lead to pods failure. ## setting inappropriate values here may lead to pods failure.
## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
## @param adminBackend.livenessProbe.enabled Enable/disable livenessProbe ## @param backend.livenessProbe.enabled Enable/disable livenessProbe
## @param adminBackend.livenessProbe.initialDelaySeconds Delay before liveness probe is initiated ## @param backend.livenessProbe.initialDelaySeconds Delay before liveness probe is initiated
## @param adminBackend.livenessProbe.periodSeconds How often to perform the probe ## @param backend.livenessProbe.periodSeconds How often to perform the probe
## @param adminBackend.livenessProbe.timeoutSeconds When the probe times out ## @param backend.livenessProbe.timeoutSeconds When the probe times out
## @param adminBackend.livenessProbe.failureThreshold Minimum consecutive failures for the probe ## @param backend.livenessProbe.failureThreshold Minimum consecutive failures for the probe
## @param adminBackend.livenessProbe.successThreshold Minimum consecutive successes for the probe ## @param backend.livenessProbe.successThreshold Minimum consecutive successes for the probe
## ##
livenessProbe: livenessProbe:
enabled: true enabled: true
@ -386,12 +392,12 @@ adminBackend:
## WARNING: Discourse installation process may take up some time and ## WARNING: Discourse installation process may take up some time and
## setting inappropriate values here may lead to pods failure. ## setting inappropriate values here may lead to pods failure.
## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
## @param adminBackend.readinessProbe.enabled Enable/disable readinessProbe ## @param backend.readinessProbe.enabled Enable/disable readinessProbe
## @param adminBackend.readinessProbe.initialDelaySeconds Delay before readiness probe is initiated ## @param backend.readinessProbe.initialDelaySeconds Delay before readiness probe is initiated
## @param adminBackend.readinessProbe.periodSeconds How often to perform the probe ## @param backend.readinessProbe.periodSeconds How often to perform the probe
## @param adminBackend.readinessProbe.timeoutSeconds When the probe times out ## @param backend.readinessProbe.timeoutSeconds When the probe times out
## @param adminBackend.readinessProbe.failureThreshold Minimum consecutive failures for the probe ## @param backend.readinessProbe.failureThreshold Minimum consecutive failures for the probe
## @param adminBackend.readinessProbe.successThreshold Minimum consecutive successes for the probe ## @param backend.readinessProbe.successThreshold Minimum consecutive successes for the probe
## ##
readinessProbe: readinessProbe:
enabled: true enabled: true
@ -400,27 +406,27 @@ adminBackend:
timeoutSeconds: 5 timeoutSeconds: 5
failureThreshold: 6 failureThreshold: 6
successThreshold: 1 successThreshold: 1
## @param adminBackend.customLivenessProbe Custom liveness probe to execute (when the main one is disabled) ## @param backend.customLivenessProbe Custom liveness probe to execute (when the main one is disabled)
## ##
customLivenessProbe: {} customLivenessProbe: {}
## @param adminBackend.customReadinessProbe Custom readiness probe to execute (when the main one is disabled) ## @param backend.customReadinessProbe Custom readiness probe to execute (when the main one is disabled)
## ##
customReadinessProbe: {} customReadinessProbe: {}
## @param adminBackend.extraEnvVars An array to add extra env vars ## @param backend.extraEnvVars An array to add extra env vars
## For example: ## For example:
## extraEnvVars: ## extraEnvVars:
## adminBackend: ## backend:
## - name: ADMIN_PANEL_ELASTICSEARCH_URL ## - name: ADMIN_PANEL_ELASTICSEARCH_URL
## value: test ## value: test
## ##
extraEnvVars: [] extraEnvVars: []
## @param adminBackend.extraEnvVarsCM Array to add extra configmaps ## @param backend.extraEnvVarsCM Array to add extra configmaps
## ##
extraEnvVarsCM: [] extraEnvVarsCM: []
## @param adminBackend.extraEnvVarsSecret Array to add extra environment variables from a secret ## @param backend.extraEnvVarsSecret Array to add extra environment variables from a secret
## ##
extraEnvVarsSecret: "" extraEnvVarsSecret: ""
## @param adminBackend.extraVolumeMounts Additional volume mounts (used along with `extraVolumes`) ## @param backend.extraVolumeMounts Additional volume mounts (used along with `extraVolumes`)
## Example: Mount CA file ## Example: Mount CA file
## extraVolumeMounts ## extraVolumeMounts
## - name: ca-cert ## - name: ca-cert
@ -494,7 +500,7 @@ persistence:
## @param persistence.enabled Whether to enable persistence based on Persistent Volume Claims ## @param persistence.enabled Whether to enable persistence based on Persistent Volume Claims
## ##
enabled: false enabled: false
## @param persistence.storageClass adminPanel & sidekiq data Persistent Volume Storage Class ## @param persistence.storageClass dashboard & sidekiq data Persistent Volume Storage Class
## If defined, storageClassName: <storageClass> ## If defined, storageClassName: <storageClass>
## If set to "-", storageClassName: "", which disables dynamic provisioning ## If set to "-", storageClassName: "", which disables dynamic provisioning
## If undefined (the default) or set to null, no storageClassName spec is ## If undefined (the default) or set to null, no storageClassName spec is
@ -622,7 +628,7 @@ ingress:
certManager: false certManager: false
## @param ingress.hostname Default host for the ingress resource ## @param ingress.hostname Default host for the ingress resource
## ##
hostname: adminpanel.local hostname: dashboard.local
## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set)
## ##
apiVersion: "" apiVersion: ""
@ -647,15 +653,15 @@ ingress:
## @param ingress.extraHosts The list of additional hostnames to be covered with this ingress record. ## @param ingress.extraHosts The list of additional hostnames to be covered with this ingress record.
## Most likely the hostname above will be enough, but in the event more hosts are needed, this is an array ## Most likely the hostname above will be enough, but in the event more hosts are needed, this is an array
## extraHosts: ## extraHosts:
## - name: adminpanel.local ## - name: dashboard.local
## path: / ## path: /
extraHosts: [] extraHosts: []
## @param ingress.extraTls The tls configuration for additional hostnames to be covered with this ingress record. ## @param ingress.extraTls The tls configuration for additional hostnames to be covered with this ingress record.
## see: https://kubernetes.io/docs/concepts/services-networking/ingress/#tls ## see: https://kubernetes.io/docs/concepts/services-networking/ingress/#tls
## extraTls: ## extraTls:
## - hosts: ## - hosts:
## - adminpanel.local ## - dashboard.local
## secretName: adminpanel.local-tls ## secretName: dashboard.local-tls
extraTls: [] extraTls: []
## @param ingress.secrets If you're providing your own certificates, please use this to add the certificates as secrets ## @param ingress.secrets If you're providing your own certificates, please use this to add the certificates as secrets
## key and certificate should start with -----BEGIN CERTIFICATE----- or ## key and certificate should start with -----BEGIN CERTIFICATE----- or
@ -667,7 +673,7 @@ ingress:
## It is also possible to create and manage the certificates outside of this helm chart ## It is also possible to create and manage the certificates outside of this helm chart
## Please see README.md for more information ## Please see README.md for more information
## Example: ## Example:
## - name: adminpanel.local-tls ## - name: dashboard.local-tls
## key: ## key:
## certificate: ## certificate:
secrets: [] secrets: []