Update secrets and labels in Helm templates

Flagro · Mar 2, 2024 · 685e85b · 685e85b
1 parent fe284a7
commit 685e85b
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 6 deletions.
diff --git a/helm/templates/db/deployment.yaml b/helm/templates/db/deployment.yaml
@@ -23,7 +23,7 @@ spec:
             - containerPort: 5432
           envFrom:
             - secretRef:
-                name: phrinifluent-db-secrets
+                name: {{ include "flatchart.fullname" . }}-db-secrets
             - configMapRef:
                 name: {{ include "flatchart.fullname" . }}-db-config
           - env:

diff --git a/helm/templates/db/secrets.yaml b/helm/templates/db/secrets.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "flatchart.fullname" . }}-db-secrets
+  labels:
+    {{- include "flatchart.labels" . | nindent 4 }}
+type: Opaque
+data:
+  POSTGRES_USER: {{ .Values.dbSecrets.user | b64enc | quote }}
+  POSTGRES_PASSWORD: {{ .Values.dbSecrets.password | b64enc | quote }}
+  POSTGRES_DB: {{ .Values.dbSecrets.dbName | b64enc | quote }}
diff --git a/helm/templates/ingress/ingress.yaml b/helm/templates/ingress/ingress.yaml
@@ -26,4 +26,4 @@ spec:
   tls:
     - hosts:
         - {{ .Values.ingress.host }}
-      secretName: phrinifluent-tls-secrets
+      secretName: {{ include "flatchart.fullname" . }}-tls-secrets
diff --git a/helm/templates/ingress/secrets.yaml b/helm/templates/ingress/secrets.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "flatchart.fullname" . }}-tls-secrets
+  labels:
+    {{- include "flatchart.labels" . | nindent 4 }}
+type: kubernetes.io/tls
+data:
+  tls.crt: {{ .Files.Get .Values.tlsSecrets.certFile | b64enc | quote }}
+  tls.key: {{ .Files.Get .Values.tlsSecrets.keyFile | b64enc | quote }}
diff --git a/helm/templates/web/deployment.yaml b/helm/templates/web/deployment.yaml
@@ -27,9 +27,9 @@ spec:
           args: {{- toYaml .Values.backendDeployment.phrinifluentBackendSetup.args | nindent 8 }}          
           envFrom:
             - secretRef:
-                name: phrinifluent-backend-secrets
+                name: {{ include "flatchart.fullname" . }}-backend-secrets
             - secretRef:
-                name: phrinifluent-db-secrets
+                name: {{ include "flatchart.fullname" . }}-db-secrets
             - configMapRef:
                 name: {{ include "flatchart.fullname" . }}-backend-config
             - configMapRef:
@@ -48,9 +48,9 @@ spec:
             - containerPort: 8000
           envFrom:
             - secretRef:
-                name: phrinifluent-backend-secrets
+                name: {{ include "flatchart.fullname" . }}-backend-secrets
             - secretRef:
-                name: phrinifluent-db-secrets
+                name: {{ include "flatchart.fullname" . }}-db-secrets
             - configMapRef:
                 name: {{ include "flatchart.fullname" . }}-backend-config
             - configMapRef:

diff --git a/helm/templates/web/secrets.yaml b/helm/templates/web/secrets.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "flatchart.fullname" . }}-backend-secrets
+  labels:
+    {{- include "flatchart.labels" . | nindent 4 }}
+type: Opaque
+data:
+  SECRET_KEY: {{ .Values.backendSecrets.secretKey | b64enc | quote }}
+  ADMIN_USERNAME: {{ .Values.backendSecrets.adminUsername | b64enc | quote }}
+  ADMIN_EMAIL: {{ .Values.backendSecrets.adminEmail | b64enc | quote }}
+  ADMIN_PASSWORD: {{ .Values.backendSecrets.adminPassword | b64enc | quote }}