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

deployment/helmchart/templates/deployment.yaml

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