adapt kustomization to new configuration

bit-bots · Jan 1, 2021 · 743144f · 743144f
1 parent 04033c0
commit 743144f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/k8s/web_app.yml b/k8s/web_app.yml
@@ -30,9 +30,6 @@ spec:
         tier: web
     spec:
       volumes:
-        - name: config
-          configMap:
-            name: imagetagger-web
         - name: data
           persistentVolumeClaim:
             claimName: imagetagger-image-data
@@ -44,10 +41,12 @@ spec:
               containerPort: 3008
             - name: http
               containerPort: 80
+          envFrom:
+            - configMapRef:
+                name: imagetagger-web
+            - configMapRef:
+                name: imagetagger-postgres
           volumeMounts:
-            - name: config
-              mountPath: /app/config
-              readOnly: true
             - name: data
               mountPath: /app/data
           livenessProbe:

diff --git a/kustomization.yml b/kustomization.yml
@@ -12,8 +12,13 @@ resources:
 
 configMapGenerator:
   - name: imagetagger-web
-    files:
-      - "settings.py=./imagetagger/imagetagger/settings.py.example"
+    literals:
+      # service hostname
+      - "IT_DB_HOST=imagetagger-postgres"
+      # references to below postgres configMap which is also mounted in the pod
+      - "IT_DB_USER=$(POSTGRES_USER)"
+      - "IT_DB_PASSWORD=$(POSTGRES_PASSWORD)"
+      - "IT_DB_NAME=$(POSTGRES_DB)"
   - name: imagetagger-postgres
     literals:
       - "POSTGRES_PASSWORD=imagetagger"