From f9516dcfa02d7ae7430001ef69fafb59fefe0668 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Mon, 22 Nov 2021 15:49:04 +0100
Subject: [PATCH] Rename admin frontend/backend
---
deployment/helmchart/templates/configmaps.yaml | 14 +++++++-------
deployment/helmchart/templates/deployment.yaml | 4 ++--
deployment/helmchart/values.yaml | 18 +++++++++---------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/deployment/helmchart/templates/configmaps.yaml b/deployment/helmchart/templates/configmaps.yaml
index 2fa47b04..a2f8262c 100644
--- a/deployment/helmchart/templates/configmaps.yaml
+++ b/deployment/helmchart/templates/configmaps.yaml
@@ -14,18 +14,18 @@ data:
FLASK_APP: app.py
FLASK_ENV: {{ .Values.backend.flaskEnv }}
# Probably needed in the future:
- # ADMIN_BACKEND_USERNAME: {{ .Values.backend.username | quote }}
- # ADMIN_BACKEND_EMAIL: {{ .Values.backend.email | quote }}
+ # DASHBOARD_BACKEND_USERNAME: {{ .Values.backend.username | quote }}
+ # DASHBOARD_BACKEND_EMAIL: {{ .Values.backend.email | quote }}
# {{- if .Values.backend.smtp.enabled }}
- # ADMIN_BACKEND_SMTP_HOST: {{ .Values.backend.smtp.host | quote }}
- # ADMIN_BACKEND_SMTP_PORT: {{ .Values.backend.smtp.port | quote }}
+ # DASHBOARD_BACKEND_SMTP_HOST: {{ .Values.backend.smtp.host | quote }}
+ # DASHBOARD_BACKEND_SMTP_PORT: {{ .Values.backend.smtp.port | quote }}
# {{- if .Values.backend.smtp.user }}
- # ADMIN_BACKEND_SMTP_USER: {{ .Values.backend.smtp.user | quote }}
+ # DASHBOARD_BACKEND_SMTP_USER: {{ .Values.backend.smtp.user | quote }}
# {{- end }}
# {{- if .Values.backend.smtp.protocol }}
- # ADMIN_BACKEND_SMTP_PROTOCOL: {{ .Values.backend.smtp.protocol | quote }}
+ # DASHBOARD_BACKEND_SMTP_PROTOCOL: {{ .Values.backend.smtp.protocol | quote }}
# {{- end }}
# {{- 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 }}
diff --git a/deployment/helmchart/templates/deployment.yaml b/deployment/helmchart/templates/deployment.yaml
index 1ffa39e6..b69be609 100644
--- a/deployment/helmchart/templates/deployment.yaml
+++ b/deployment/helmchart/templates/deployment.yaml
@@ -127,13 +127,13 @@ spec:
args: {{- include "common.tplvalues.render" (dict "value" .Values.backend.args "context" $) | nindent 12 }}
{{- end }}
env:
- - name: ADMIN_PANEL_PASSWORD
+ - name: DASHBOARD_PASSWORD
valueFrom:
secretKeyRef:
name: {{ include "backend.secretName" . }}
key: backend-password
{{- if (include "backend.smtp.password.enabled" .) }}
- - name: ADMIN_PANEL_SMTP_PASSWORD
+ - name: DASHBOARD_SMTP_PASSWORD
valueFrom:
secretKeyRef:
name: {{ include "backend.smtp.secretName" . }}
diff --git a/deployment/helmchart/values.yaml b/deployment/helmchart/values.yaml
index bd8d3933..c9ad80b8 100644
--- a/deployment/helmchart/values.yaml
+++ b/deployment/helmchart/values.yaml
@@ -43,11 +43,11 @@ commonAnnotations: {}
image:
imagePullSecrets: []
-## Admin dashboard configuration parameters
+## Dashboard configuration parameters
## ref: https://open.greenhost.net/stackspin/dashboard
##
dashboard:
- ## Admin dashboard image version
+ ## Dashboard image version
## ref: https://hub.docker.com/r/bitnami/dashboard/tags/
## @param image.registry Stackspin image registry
## @param image.repository Stackspin image repository
@@ -58,7 +58,7 @@ dashboard:
##
image:
registry: open.greenhost.net:4567
- repository: stackspin/admin/admin
+ repository: stackspin/dashboard/dashboard
tag: 0.1.1
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -198,7 +198,7 @@ dashboard:
## For example:
## extraEnvVars:
## dashboard:
- ## - name: ADMIN_PANEL_ELASTICSEARCH_URL
+ ## - name: DASHBOARD_ELASTICSEARCH_URL
## value: test
##
extraEnvVars: []
@@ -216,11 +216,11 @@ dashboard:
## mountPath: /path/to/ca_cert
##
extraVolumeMounts: []
-## Admin backend configuration parameters
+## Dashboard backend configuration parameters
## ref: https://open.greenhost.net/stackspin/dashboard-backend
##
backend:
- ## Admin dashboard image version
+ ## Dashboard image version
## ref: https://hub.docker.com/r/bitnami/dashboard/tags/
## @param image.registry Stackspin image registry
## @param image.repository Stackspin image repository
@@ -231,7 +231,7 @@ backend:
##
image:
registry: open.greenhost.net:4567
- repository: stackspin/admin-backend/admin-backend
+ repository: stackspin/dashboard-backend/dashboard-backend
tag: 0.1.0
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -309,7 +309,7 @@ backend:
##
email: user@example.com
- ## Admin panel SMTP settings
+ ## dashboard SMTP settings
## @param backend.smtp.enabled Enable/disable SMTP
## @param backend.smtp.host SMTP host name
## @param backend.smtp.port SMTP port number
@@ -419,7 +419,7 @@ backend:
## For example:
## extraEnvVars:
## backend:
- ## - name: ADMIN_PANEL_ELASTICSEARCH_URL
+ ## - name: DASHBOARD_ELASTICSEARCH_URL
## value: test
##
extraEnvVars: []
--
GitLab