refactoring secrets into an actual secret k8s object instead of makin…

…g them part of the configmap Signed-off-by: wdower <will@dower.dev>
mitre · Mar 18, 2024 · 67547e4 · 67547e4
1 parent d2a370c
commit 67547e4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/vulcan/templates/configmap.yaml b/vulcan/templates/configmap.yaml
@@ -3,9 +3,6 @@ kind: ConfigMap
 metadata:
   name: {{ .Values.vulcan.configmap.name }}
 data:
-  {{ range .Files.Lines "env/vulcan-secrets.yaml" }}
-    {{ . }}
-  {{ end }}
   {{ range .Files.Lines "env/vulcanconfig.yaml" }}
     {{ . }}
   {{ end }}
diff --git a/vulcan/templates/postgres-deployment.yaml b/vulcan/templates/postgres-deployment.yaml
@@ -42,7 +42,9 @@ spec: # of the deployment
               readOnly: false
           envFrom:
             - configMapRef:
-                name: vulcan-config
+                name: {{ .Values.vulcan.configmap.name }}
+            - secretRef:
+                name: {{ .Values.vulcan.secret.name }}
           readinessProbe:
             exec:
               command: ["pg_isready", "-U", "postgres"]

diff --git a/vulcan/templates/vulcan-deployment.yaml b/vulcan/templates/vulcan-deployment.yaml
@@ -40,3 +40,5 @@ spec:
         envFrom:
         - configMapRef:
             name: {{ .Values.vulcan.configmap.name }}
+        - secretRef:
+            name: {{ .Values.vulcan.secret.name }}
diff --git a/vulcan/templates/vulcan-secrets.yaml b/vulcan/templates/vulcan-secrets.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Values.vulcan.secret.name }}
+data:
+  {{ range .Files.Lines "env/vulcan-secrets.yaml" }}
+    {{ . }}
+  {{ end }}
diff --git a/vulcan/values.yaml b/vulcan/values.yaml
@@ -35,6 +35,9 @@ vulcan:
   configmap:
     name: vulcan-config
 
+  secret:
+    name: vulcan-secrets
+
   service:
     type: ClusterIP
     port: 3000