Merge branch 'rename_to_dashboard' into 'main'
Rename to dashboard Closes #8 See merge request stackspin/dashboard!9
This commit is contained in:
commit
f87849771b
10 changed files with 125 additions and 126 deletions
|
@ -5,7 +5,7 @@ stages:
|
||||||
image: node:14-alpine
|
image: node:14-alpine
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
KANIKO_BUILD_IMAGENAME: admin-frontend
|
KANIKO_BUILD_IMAGENAME: dashboard
|
||||||
|
|
||||||
build-project:
|
build-project:
|
||||||
stage: build-project
|
stage: build-project
|
||||||
|
@ -37,4 +37,3 @@ build-container:
|
||||||
- cd web-build
|
- cd web-build
|
||||||
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
|
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
|
||||||
- /kaniko/executor --cache=true --context ${CI_PROJECT_DIR}/web-build --destination ${CI_REGISTRY_IMAGE}/${KANIKO_BUILD_IMAGENAME}:${CI_COMMIT_REF_SLUG}
|
- /kaniko/executor --cache=true --context ${CI_PROJECT_DIR}/web-build --destination ${CI_REGISTRY_IMAGE}/${KANIKO_BUILD_IMAGENAME}:${CI_COMMIT_REF_SLUG}
|
||||||
|
|
||||||
|
|
|
@ -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/dashboard-frontend/
|
home: https://open.greenhost.net/stackspin/dashboard/
|
||||||
icon: https://open.greenhost.net/openappstack/dashboard-frontend/-/blob/master/public/assets/logo.svg
|
icon: https://open.greenhost.net/stackspin/dashboard/-/blob/master/public/assets/logo.svg
|
||||||
keywords:
|
keywords:
|
||||||
- stackspin
|
- stackspin
|
||||||
- dashboard
|
- dashboard
|
||||||
maintainers:
|
maintainers:
|
||||||
- email: info@openappstack.net
|
- email: info@stackspin.net
|
||||||
name: Stackspin
|
name: Stackspin
|
||||||
name: stackspin-dashboard
|
name: stackspin-dashboard
|
||||||
sources:
|
sources:
|
||||||
- https://open.greenhost.net/openappstack/dashboard-frontend/
|
- https://open.greenhost.net/stackspin/dashboard/
|
||||||
- https://open.greenhost.net/openappstack/dashboard-backend/
|
- https://open.greenhost.net/stackspin/dashboard-backend/
|
||||||
version: 0.1.0
|
version: 0.1.0
|
||||||
|
|
|
@ -61,11 +61,11 @@ Return true if 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 "frontend.serviceIP" -}}
|
{{- define "dashboard.serviceIP" -}}
|
||||||
{{- if eq .Values.frontend.service.type "ClusterIP" -}}
|
{{- if eq .Values.dashboard.service.type "ClusterIP" -}}
|
||||||
127.0.0.1
|
127.0.0.1
|
||||||
{{- else -}}
|
{{- else -}}
|
||||||
{{- .Values.frontend.service.loadBalancerIP | default "" -}}
|
{{- .Values.dashboard.service.loadBalancerIP | default "" -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
|
@ -73,9 +73,9 @@ 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 "frontend.host" -}}
|
{{- define "dashboard.host" -}}
|
||||||
{{- $host := .Values.frontend.host | default "" -}}
|
{{- $host := .Values.dashboard.host | default "" -}}
|
||||||
{{- default (include "frontend.serviceIP" .) $host -}}
|
{{- default (include "dashboard.serviceIP" .) $host -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
{{/*
|
{{/*
|
||||||
|
@ -86,10 +86,10 @@ Service name for the backend service
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
{{/*
|
{{/*
|
||||||
Service name for the frontend service
|
Service name for the dashboard service
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "frontend.serviceName" -}}
|
{{- define "dashboard.serviceName" -}}
|
||||||
{{ include "common.names.fullname" . }}-frontend
|
{{ include "common.names.fullname" . }}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
{{/*
|
{{/*
|
||||||
|
@ -114,10 +114,10 @@ If not using ClusterIP, or if a host or LoadBalancerIP is not defined, the value
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
{{/*
|
{{/*
|
||||||
Return the proper frontend image name
|
Return the proper dashboard image name
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "frontend.image" -}}
|
{{- define "dashboard.image" -}}
|
||||||
{{ include "common.images.image" (dict "imageRoot" .Values.frontend.image "global" .Values.global) }}
|
{{ include "common.images.image" (dict "imageRoot" .Values.dashboard.image "global" .Values.global) }}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{/*
|
{{/*
|
||||||
Return the proper backend image name
|
Return the proper backend image name
|
||||||
|
|
|
@ -14,18 +14,18 @@ data:
|
||||||
FLASK_APP: app.py
|
FLASK_APP: app.py
|
||||||
FLASK_ENV: {{ .Values.backend.flaskEnv }}
|
FLASK_ENV: {{ .Values.backend.flaskEnv }}
|
||||||
# Probably needed in the future:
|
# Probably needed in the future:
|
||||||
# ADMIN_BACKEND_USERNAME: {{ .Values.backend.username | quote }}
|
# DASHBOARD_BACKEND_USERNAME: {{ .Values.backend.username | quote }}
|
||||||
# ADMIN_BACKEND_EMAIL: {{ .Values.backend.email | quote }}
|
# DASHBOARD_BACKEND_EMAIL: {{ .Values.backend.email | quote }}
|
||||||
# {{- if .Values.backend.smtp.enabled }}
|
# {{- if .Values.backend.smtp.enabled }}
|
||||||
# ADMIN_BACKEND_SMTP_HOST: {{ .Values.backend.smtp.host | quote }}
|
# DASHBOARD_BACKEND_SMTP_HOST: {{ .Values.backend.smtp.host | quote }}
|
||||||
# ADMIN_BACKEND_SMTP_PORT: {{ .Values.backend.smtp.port | quote }}
|
# DASHBOARD_BACKEND_SMTP_PORT: {{ .Values.backend.smtp.port | quote }}
|
||||||
# {{- if .Values.backend.smtp.user }}
|
# {{- if .Values.backend.smtp.user }}
|
||||||
# ADMIN_BACKEND_SMTP_USER: {{ .Values.backend.smtp.user | quote }}
|
# DASHBOARD_BACKEND_SMTP_USER: {{ .Values.backend.smtp.user | quote }}
|
||||||
# {{- end }}
|
# {{- end }}
|
||||||
# {{- if .Values.backend.smtp.protocol }}
|
# {{- if .Values.backend.smtp.protocol }}
|
||||||
# ADMIN_BACKEND_SMTP_PROTOCOL: {{ .Values.backend.smtp.protocol | quote }}
|
# DASHBOARD_BACKEND_SMTP_PROTOCOL: {{ .Values.backend.smtp.protocol | quote }}
|
||||||
# {{- end }}
|
# {{- end }}
|
||||||
# {{- if .Values.backend.smtp.auth }}
|
# {{- if .Values.backend.smtp.auth }}
|
||||||
# ADMIN_BACKEND_SMTP_AUTH: {{ .Values.backend.smtp.auth | quote }}
|
# DASHBOARD_BACKEND_SMTP_AUTH: {{ .Values.backend.smtp.auth | quote }}
|
||||||
# {{- end }}
|
# {{- end }}
|
||||||
# {{- end }}
|
# {{- end }}
|
||||||
|
|
|
@ -54,67 +54,67 @@ spec:
|
||||||
{{- 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: frontend
|
- name: dashboard
|
||||||
securityContext: {{- toYaml .Values.frontend.containerSecurityContext | nindent 12 }}
|
securityContext: {{- toYaml .Values.dashboard.containerSecurityContext | nindent 12 }}
|
||||||
image: {{ template "frontend.image" . }}
|
image: {{ template "dashboard.image" . }}
|
||||||
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
|
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
|
||||||
{{- if .Values.frontend.command }}
|
{{- if .Values.dashboard.command }}
|
||||||
command: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.command "context" $) | nindent 12 }}
|
command: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.command "context" $) | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.frontend.args }}
|
{{- if .Values.dashboard.args }}
|
||||||
args: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.args "context" $) | nindent 12 }}
|
args: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.args "context" $) | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
env:
|
env:
|
||||||
{{- if .Values.frontend.extraEnvVars }}
|
{{- if .Values.dashboard.extraEnvVars }}
|
||||||
{{- include "common.tplvalues.render" (dict "value" .Values.frontend.extraEnvVars "context" $) | nindent 12 }}
|
{{- include "common.tplvalues.render" (dict "value" .Values.dashboard.extraEnvVars "context" $) | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
envFrom:
|
envFrom:
|
||||||
- configMapRef:
|
- configMapRef:
|
||||||
name: {{ include "common.names.fullname" . }}
|
name: {{ include "common.names.fullname" . }}
|
||||||
{{- if .Values.frontend.extraEnvVarsCM }}
|
{{- if .Values.dashboard.extraEnvVarsCM }}
|
||||||
- configMapRef:
|
- configMapRef:
|
||||||
name: {{ .Values.frontend.extraEnvVarsCM }}
|
name: {{ .Values.dashboard.extraEnvVarsCM }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.frontend.extraEnvVarsSecret }}
|
{{- if .Values.dashboard.extraEnvVarsSecret }}
|
||||||
- secretRef:
|
- secretRef:
|
||||||
name: {{ .Values.frontend.extraEnvVarsSecret }}
|
name: {{ .Values.dashboard.extraEnvVarsSecret }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
ports:
|
ports:
|
||||||
- name: frontend-http
|
- name: dashboard-http
|
||||||
containerPort: 80
|
containerPort: 80
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
{{- if .Values.frontend.livenessProbe.enabled }}
|
{{- if .Values.dashboard.livenessProbe.enabled }}
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /
|
path: /
|
||||||
port: frontend-http
|
port: dashboard-http
|
||||||
initialDelaySeconds: {{ .Values.frontend.livenessProbe.initialDelaySeconds }}
|
initialDelaySeconds: {{ .Values.dashboard.livenessProbe.initialDelaySeconds }}
|
||||||
periodSeconds: {{ .Values.frontend.livenessProbe.periodSeconds }}
|
periodSeconds: {{ .Values.dashboard.livenessProbe.periodSeconds }}
|
||||||
timeoutSeconds: {{ .Values.frontend.livenessProbe.timeoutSeconds }}
|
timeoutSeconds: {{ .Values.dashboard.livenessProbe.timeoutSeconds }}
|
||||||
successThreshold: {{ .Values.frontend.livenessProbe.successThreshold }}
|
successThreshold: {{ .Values.dashboard.livenessProbe.successThreshold }}
|
||||||
failureThreshold: {{ .Values.frontend.livenessProbe.failureThreshold }}
|
failureThreshold: {{ .Values.dashboard.livenessProbe.failureThreshold }}
|
||||||
{{- else if .Values.frontend.customLivenessProbe }}
|
{{- else if .Values.dashboard.customLivenessProbe }}
|
||||||
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.customLivenessProbe "context" $) | nindent 12 }}
|
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customLivenessProbe "context" $) | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.frontend.readinessProbe.enabled }}
|
{{- if .Values.dashboard.readinessProbe.enabled }}
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /
|
path: /
|
||||||
port: frontend-http
|
port: dashboard-http
|
||||||
initialDelaySeconds: {{ .Values.frontend.readinessProbe.initialDelaySeconds }}
|
initialDelaySeconds: {{ .Values.dashboard.readinessProbe.initialDelaySeconds }}
|
||||||
periodSeconds: {{ .Values.frontend.readinessProbe.periodSeconds }}
|
periodSeconds: {{ .Values.dashboard.readinessProbe.periodSeconds }}
|
||||||
timeoutSeconds: {{ .Values.frontend.readinessProbe.timeoutSeconds }}
|
timeoutSeconds: {{ .Values.dashboard.readinessProbe.timeoutSeconds }}
|
||||||
successThreshold: {{ .Values.frontend.readinessProbe.successThreshold }}
|
successThreshold: {{ .Values.dashboard.readinessProbe.successThreshold }}
|
||||||
failureThreshold: {{ .Values.frontend.readinessProbe.failureThreshold }}
|
failureThreshold: {{ .Values.dashboard.readinessProbe.failureThreshold }}
|
||||||
{{- else if .Values.frontend.customReadinessProbe }}
|
{{- else if .Values.dashboard.customReadinessProbe }}
|
||||||
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.customReadinessProbe "context" $) | nindent 12 }}
|
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customReadinessProbe "context" $) | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
{{- if .Values.frontend.extraVolumeMounts }}
|
{{- if .Values.dashboard.extraVolumeMounts }}
|
||||||
{{- include "common.tplvalues.render" (dict "value" .Values.frontend.extraVolumeMounts "context" $) | nindent 12 }}
|
{{- include "common.tplvalues.render" (dict "value" .Values.dashboard.extraVolumeMounts "context" $) | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.frontend.resources }}
|
{{- if .Values.dashboard.resources }}
|
||||||
resources: {{- toYaml .Values.frontend.resources | nindent 12 }}
|
resources: {{- toYaml .Values.dashboard.resources | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
- name: backend
|
- name: backend
|
||||||
securityContext: {{- toYaml .Values.backend.containerSecurityContext | nindent 12 }}
|
securityContext: {{- toYaml .Values.backend.containerSecurityContext | nindent 12 }}
|
||||||
|
@ -127,13 +127,13 @@ spec:
|
||||||
args: {{- include "common.tplvalues.render" (dict "value" .Values.backend.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: DASHBOARD_PASSWORD
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ include "backend.secretName" . }}
|
name: {{ include "backend.secretName" . }}
|
||||||
key: backend-password
|
key: backend-password
|
||||||
{{- if (include "backend.smtp.password.enabled" .) }}
|
{{- if (include "backend.smtp.password.enabled" .) }}
|
||||||
- name: ADMIN_PANEL_SMTP_PASSWORD
|
- name: DASHBOARD_SMTP_PASSWORD
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ include "backend.smtp.secretName" . }}
|
name: {{ include "backend.smtp.secretName" . }}
|
||||||
|
|
|
@ -1,42 +1,42 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "frontend.serviceName" . }}
|
name: {{ include "dashboard.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.frontend.service.annotations .Values.commonAnnotations}}
|
{{- if or .Values.dashboard.service.annotations .Values.commonAnnotations}}
|
||||||
annotations:
|
annotations:
|
||||||
{{- if .Values.frontend.service.annotations }}
|
{{- if .Values.dashboard.service.annotations }}
|
||||||
{{- include "common.tplvalues.render" (dict "value" .Values.frontend.service.annotations "context" $) | nindent 4 }}
|
{{- include "common.tplvalues.render" (dict "value" .Values.dashboard.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.frontend.service.type }}
|
type: {{ .Values.dashboard.service.type }}
|
||||||
{{- if (or (eq .Values.frontend.service.type "LoadBalancer") (eq .Values.frontend.service.type "NodePort")) }}
|
{{- if (or (eq .Values.dashboard.service.type "LoadBalancer") (eq .Values.dashboard.service.type "NodePort")) }}
|
||||||
externalTrafficPolicy: {{ .Values.frontend.service.externalTrafficPolicy | quote }}
|
externalTrafficPolicy: {{ .Values.dashboard.service.externalTrafficPolicy | quote }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if (and (eq .Values.frontend.service.type "LoadBalancer") (not (empty .Values.frontend.service.loadBalancerIP))) }}
|
{{- if (and (eq .Values.dashboard.service.type "LoadBalancer") (not (empty .Values.dashboard.service.loadBalancerIP))) }}
|
||||||
loadBalancerIP: {{ .Values.frontend.service.loadBalancerIP }}
|
loadBalancerIP: {{ .Values.dashboard.service.loadBalancerIP }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if (and (eq .Values.frontend.service.type "LoadBalancer") .Values.frontend.service.loadBalancerSourceRanges) }}
|
{{- if (and (eq .Values.dashboard.service.type "LoadBalancer") .Values.dashboard.service.loadBalancerSourceRanges) }}
|
||||||
loadBalancerSourceRanges:
|
loadBalancerSourceRanges:
|
||||||
{{ toYaml .Values.frontend.service.loadBalancerSourceRanges | nindent 4 }}
|
{{ toYaml .Values.dashboard.service.loadBalancerSourceRanges | nindent 4 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
ports:
|
ports:
|
||||||
- name: http
|
- name: http
|
||||||
port: {{ .Values.frontend.service.port }}
|
port: {{ .Values.dashboard.service.port }}
|
||||||
targetPort: frontend-http
|
targetPort: dashboard-http
|
||||||
{{- if (and (or (eq .Values.frontend.service.type "NodePort") (eq .Values.frontend.service.type "LoadBalancer")) (not (empty .Values.frontend.service.nodePorts.http))) }}
|
{{- if (and (or (eq .Values.dashboard.service.type "NodePort") (eq .Values.dashboard.service.type "LoadBalancer")) (not (empty .Values.dashboard.service.nodePorts.http))) }}
|
||||||
nodePort: {{ .Values.frontend.service.nodePorts.http }}
|
nodePort: {{ .Values.dashboard.service.nodePorts.http }}
|
||||||
{{- else if eq .Values.frontend.service.type "ClusterIP" }}
|
{{- else if eq .Values.dashboard.service.type "ClusterIP" }}
|
||||||
nodePort: null
|
nodePort: null
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.frontend.service.extraPorts }}
|
{{- if .Values.dashboard.service.extraPorts }}
|
||||||
{{- include "common.tplvalues.render" (dict "value" .Values.frontend.service.extraPorts "context" $) | nindent 4 }}
|
{{- include "common.tplvalues.render" (dict "value" .Values.dashboard.service.extraPorts "context" $) | nindent 4 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
|
selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
|
||||||
|
|
|
@ -40,7 +40,7 @@ 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 "frontend.serviceName" .) "servicePort" "frontend-http" "context" $) | nindent 14 }}
|
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "dashboard.serviceName" .) "servicePort" "dashboard-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" .) }}
|
||||||
|
@ -56,7 +56,7 @@ 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 "frontend.serviceName" $) "servicePort" "frontend-http" "context" $) | nindent 14 }}
|
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "dashboard.serviceName" $) "servicePort" "dashboard-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 }}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# Disabled by default because the current dashboard does not need persistence
|
# Disabled by default because the current dashboard does not need persistence
|
||||||
{{- if and (include "frontend.host" .) .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
|
{{- if and (include "dashboard.host" .) .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
|
||||||
kind: PersistentVolumeClaim
|
kind: PersistentVolumeClaim
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
metadata:
|
metadata:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Values you will likely want to override. See values.yaml for their meanings
|
# Values you will likely want to override. See values.yaml for their meanings
|
||||||
|
|
||||||
frontend:
|
dashboard:
|
||||||
host: dashboard.oas.example.com
|
host: dashboard.oas.example.com
|
||||||
|
|
||||||
backend:
|
backend:
|
||||||
|
|
|
@ -43,12 +43,12 @@ commonAnnotations: {}
|
||||||
image:
|
image:
|
||||||
imagePullSecrets: []
|
imagePullSecrets: []
|
||||||
|
|
||||||
## Admin frontend configuration parameters
|
## Dashboard configuration parameters
|
||||||
## ref: https://open.greenhost.net/openappstack/dashboard-frontend
|
## ref: https://open.greenhost.net/stackspin/dashboard
|
||||||
##
|
##
|
||||||
frontend:
|
dashboard:
|
||||||
## Admin frontend image version
|
## Dashboard image version
|
||||||
## ref: https://hub.docker.com/r/bitnami/frontend/tags/
|
## ref: https://hub.docker.com/r/bitnami/dashboard/tags/
|
||||||
## @param image.registry Stackspin image registry
|
## @param image.registry Stackspin image registry
|
||||||
## @param image.repository Stackspin image repository
|
## @param image.repository Stackspin image repository
|
||||||
## @param image.tag Stackspin image tag
|
## @param image.tag Stackspin image tag
|
||||||
|
@ -58,7 +58,7 @@ frontend:
|
||||||
##
|
##
|
||||||
image:
|
image:
|
||||||
registry: open.greenhost.net:4567
|
registry: open.greenhost.net:4567
|
||||||
repository: openappstack/admin-frontend/admin-frontend
|
repository: stackspin/dashboard/dashboard
|
||||||
tag: 0.1.1
|
tag: 0.1.1
|
||||||
## Specify a imagePullPolicy
|
## Specify a imagePullPolicy
|
||||||
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
|
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
|
||||||
|
@ -111,18 +111,18 @@ frontend:
|
||||||
##
|
##
|
||||||
nodePorts:
|
nodePorts:
|
||||||
http: ""
|
http: ""
|
||||||
## @param frontend.extendEslint Whether to read .eslint.json rules
|
## @param dashboard.extendEslint Whether to read .eslint.json rules
|
||||||
extendEslint: false
|
extendEslint: false
|
||||||
## @param frontend.host Stackspin host to create application URLs (include the port if =/= 80)
|
## @param dashboard.host Stackspin host to create application URLs (include the port if =/= 80)
|
||||||
##
|
##
|
||||||
host: ""
|
host: ""
|
||||||
## @param frontend.command Custom command to override image cmd
|
## @param dashboard.command Custom command to override image cmd
|
||||||
##
|
##
|
||||||
command: []
|
command: []
|
||||||
## @param frontend.args Custom args for the custom command
|
## @param dashboard.args Custom args for the custom command
|
||||||
##
|
##
|
||||||
args: []
|
args: []
|
||||||
## @param frontend.containerSecurityContext Container security context specification
|
## @param dashboard.containerSecurityContext Container security context specification
|
||||||
## Example:
|
## Example:
|
||||||
## capabilities:
|
## capabilities:
|
||||||
## drop:
|
## drop:
|
||||||
|
@ -138,8 +138,8 @@ frontend:
|
||||||
## 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 frontend.resources.limits The resources limits for the container
|
## @param dashboard.resources.limits The resources limits for the container
|
||||||
## @param frontend.resources.requests The requested resources for the container
|
## @param dashboard.resources.requests The requested resources for the container
|
||||||
##
|
##
|
||||||
resources:
|
resources:
|
||||||
## Example:
|
## Example:
|
||||||
|
@ -156,12 +156,12 @@ frontend:
|
||||||
## WARNING: Stackspin installation process may take up some time and
|
## WARNING: Stackspin 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 frontend.livenessProbe.enabled Enable/disable livenessProbe
|
## @param dashboard.livenessProbe.enabled Enable/disable livenessProbe
|
||||||
## @param frontend.livenessProbe.initialDelaySeconds Delay before liveness probe is initiated
|
## @param dashboard.livenessProbe.initialDelaySeconds Delay before liveness probe is initiated
|
||||||
## @param frontend.livenessProbe.periodSeconds How often to perform the probe
|
## @param dashboard.livenessProbe.periodSeconds How often to perform the probe
|
||||||
## @param frontend.livenessProbe.timeoutSeconds When the probe times out
|
## @param dashboard.livenessProbe.timeoutSeconds When the probe times out
|
||||||
## @param frontend.livenessProbe.failureThreshold Minimum consecutive failures for the probe
|
## @param dashboard.livenessProbe.failureThreshold Minimum consecutive failures for the probe
|
||||||
## @param frontend.livenessProbe.successThreshold Minimum consecutive successes for the probe
|
## @param dashboard.livenessProbe.successThreshold Minimum consecutive successes for the probe
|
||||||
##
|
##
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
@ -174,12 +174,12 @@ frontend:
|
||||||
## WARNING: Stackspin installation process may take up some time and
|
## WARNING: Stackspin 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 frontend.readinessProbe.enabled Enable/disable readinessProbe
|
## @param dashboard.readinessProbe.enabled Enable/disable readinessProbe
|
||||||
## @param frontend.readinessProbe.initialDelaySeconds Delay before readiness probe is initiated
|
## @param dashboard.readinessProbe.initialDelaySeconds Delay before readiness probe is initiated
|
||||||
## @param frontend.readinessProbe.periodSeconds How often to perform the probe
|
## @param dashboard.readinessProbe.periodSeconds How often to perform the probe
|
||||||
## @param frontend.readinessProbe.timeoutSeconds When the probe times out
|
## @param dashboard.readinessProbe.timeoutSeconds When the probe times out
|
||||||
## @param frontend.readinessProbe.failureThreshold Minimum consecutive failures for the probe
|
## @param dashboard.readinessProbe.failureThreshold Minimum consecutive failures for the probe
|
||||||
## @param frontend.readinessProbe.successThreshold Minimum consecutive successes for the probe
|
## @param dashboard.readinessProbe.successThreshold Minimum consecutive successes for the probe
|
||||||
##
|
##
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
@ -188,27 +188,27 @@ frontend:
|
||||||
timeoutSeconds: 5
|
timeoutSeconds: 5
|
||||||
failureThreshold: 6
|
failureThreshold: 6
|
||||||
successThreshold: 1
|
successThreshold: 1
|
||||||
## @param frontend.customLivenessProbe Custom liveness probe to execute (when the main one is disabled)
|
## @param dashboard.customLivenessProbe Custom liveness probe to execute (when the main one is disabled)
|
||||||
##
|
##
|
||||||
customLivenessProbe: {}
|
customLivenessProbe: {}
|
||||||
## @param frontend.customReadinessProbe Custom readiness probe to execute (when the main one is disabled)
|
## @param dashboard.customReadinessProbe Custom readiness probe to execute (when the main one is disabled)
|
||||||
##
|
##
|
||||||
customReadinessProbe: {}
|
customReadinessProbe: {}
|
||||||
## @param frontend.extraEnvVars An array to add extra env vars
|
## @param dashboard.extraEnvVars An array to add extra env vars
|
||||||
## For example:
|
## For example:
|
||||||
## extraEnvVars:
|
## extraEnvVars:
|
||||||
## frontend:
|
## dashboard:
|
||||||
## - name: ADMIN_PANEL_ELASTICSEARCH_URL
|
## - name: DASHBOARD_ELASTICSEARCH_URL
|
||||||
## value: test
|
## value: test
|
||||||
##
|
##
|
||||||
extraEnvVars: []
|
extraEnvVars: []
|
||||||
## @param frontend.extraEnvVarsCM Array to add extra configmaps
|
## @param dashboard.extraEnvVarsCM Array to add extra configmaps
|
||||||
##
|
##
|
||||||
extraEnvVarsCM: []
|
extraEnvVarsCM: []
|
||||||
## @param frontend.extraEnvVarsSecret Array to add extra environment variables from a secret
|
## @param dashboard.extraEnvVarsSecret Array to add extra environment variables from a secret
|
||||||
##
|
##
|
||||||
extraEnvVarsSecret: ""
|
extraEnvVarsSecret: ""
|
||||||
## @param frontend.extraVolumeMounts Additional volume mounts (used along with `extraVolumes`)
|
## @param dashboard.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 @@ frontend:
|
||||||
## mountPath: /path/to/ca_cert
|
## mountPath: /path/to/ca_cert
|
||||||
##
|
##
|
||||||
extraVolumeMounts: []
|
extraVolumeMounts: []
|
||||||
## Admin backend configuration parameters
|
## Dashboard backend configuration parameters
|
||||||
## ref: https://open.greenhost.net/openappstack/dashboard-backend
|
## ref: https://open.greenhost.net/stackspin/dashboard-backend
|
||||||
##
|
##
|
||||||
backend:
|
backend:
|
||||||
## Admin frontend image version
|
## Dashboard image version
|
||||||
## ref: https://hub.docker.com/r/bitnami/frontend/tags/
|
## ref: https://hub.docker.com/r/bitnami/dashboard/tags/
|
||||||
## @param image.registry Stackspin image registry
|
## @param image.registry Stackspin image registry
|
||||||
## @param image.repository Stackspin image repository
|
## @param image.repository Stackspin image repository
|
||||||
## @param image.tag Stackspin image tag
|
## @param image.tag Stackspin image tag
|
||||||
|
@ -231,7 +231,7 @@ backend:
|
||||||
##
|
##
|
||||||
image:
|
image:
|
||||||
registry: open.greenhost.net:4567
|
registry: open.greenhost.net:4567
|
||||||
repository: openappstack/admin-backend/admin-backend
|
repository: stackspin/dashboard-backend/dashboard-backend
|
||||||
tag: 0.1.0
|
tag: 0.1.0
|
||||||
## Specify a imagePullPolicy
|
## Specify a imagePullPolicy
|
||||||
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
|
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
|
||||||
|
@ -309,7 +309,7 @@ backend:
|
||||||
##
|
##
|
||||||
email: user@example.com
|
email: user@example.com
|
||||||
|
|
||||||
## Admin panel SMTP settings
|
## dashboard SMTP settings
|
||||||
## @param backend.smtp.enabled Enable/disable SMTP
|
## @param backend.smtp.enabled Enable/disable SMTP
|
||||||
## @param backend.smtp.host SMTP host name
|
## @param backend.smtp.host SMTP host name
|
||||||
## @param backend.smtp.port SMTP port number
|
## @param backend.smtp.port SMTP port number
|
||||||
|
@ -419,7 +419,7 @@ backend:
|
||||||
## For example:
|
## For example:
|
||||||
## extraEnvVars:
|
## extraEnvVars:
|
||||||
## backend:
|
## backend:
|
||||||
## - name: ADMIN_PANEL_ELASTICSEARCH_URL
|
## - name: DASHBOARD_ELASTICSEARCH_URL
|
||||||
## value: test
|
## value: test
|
||||||
##
|
##
|
||||||
extraEnvVars: []
|
extraEnvVars: []
|
||||||
|
|
Loading…
Reference in a new issue