fix(centurion_erp): Use projected/sources for mounting cm/secrets for configuration

ref: #22 #1

Author: jon-nfc

manifests/centurion_erp/base/Deployment-api.yaml

@@ -26,9 +26,6 @@ spec:
 
         - name: web
           image: nofusscomputing/centurion-erp:dev
-          env:
-            - name: PROMETHEUS_MULTIPROC_DIR
-              value: '/tmp/prometheus'
           resources:
             limits:
               cpu: 1
@@ -43,11 +40,6 @@ spec:
 
           volumeMounts:
 
-            - name: celery-broker
-              mountPath: /etc/itsm/10.celery-broker.py
-              subPath: 10.celery-broker.py
-              readOnly: true
-
             - name: configuration
               mountPath: /etc/itsm
               readOnly: true
@@ -56,11 +48,6 @@ spec:
               mountPath: /data
               subPath: data
 
-            - name: database
-              mountPath: /etc/itsm/20.database.py
-              subPath: 20.database.py
-              readOnly: true
-
             - mountPath: /var/log
               name: logs
 
@@ -86,32 +73,36 @@ spec:
 
           volumeMounts: []
 
-      priorityClassName: cluster-low
       tolerations: []
       volumes:
 
-        - name: celery-broker
-          secret:
-            secretName: celery-broker
-            items:
-              - key: 10.celery-broker.py
-                path: 10.celery-broker.py
-
         - name: configuration
-          configMap:
-            name: configuration
+          projected:
+            sources:
+              - configMap:
+                  name: configuration
+                  items:
+                    - key: 00.settings.py
+                      path: 00.settings.py
+                    - key: 15.ui-redirect.py
+                      path: 15.ui-redirect.py
+                    - key: 80.csrf.py
+                      path: 80.csrf.py
+              - secret:
+                  name: celery-broker
+                  items:
+                    - key: 10.celery-broker.py
+                      path: 10.celery-broker.py
+              - secret:
+                  name: database
+                  items:
+                    - key: 20.database.py
+                      path: 20.database.py
 
         - name: data
           persistentVolumeClaim:
             claimName: centurion
 
-        - name: database
-          secret:
-            secretName: database
-            items:
-              - key: 20.database.py
-                path: 20.database.py
-
         - name: logs
           hostPath:
             path: /opt/logs/centurion-api

manifests/centurion_erp/base/Deployment-worker.yaml

@@ -42,19 +42,8 @@ spec:
 
           volumeMounts:
 
-            - name: celery-broker
-              mountPath: /etc/itsm/10.celery-broker.py
-              subPath: 10.celery-broker.py
-              readOnly: true
-
             - name: configuration
-              mountPath: /etc/itsm/00.settings.py
-              subPath: 00.settings.py
-              readOnly: true
-
-            - name: database
-              mountPath: /etc/itsm/20.database.py
-              subPath: 20.database.py
+              mountPath: /etc/itsm
               readOnly: true
 
             - mountPath: /var/log
@@ -67,26 +56,24 @@ spec:
       tolerations: []
       volumes:
 
-        - name: celery-broker
-          secret:
-            secretName: celery-broker
-            items:
-              - key: 10.celery-broker.py
-                path: 10.celery-broker.py
-
         - name: configuration
-          configMap:
-            name: configuration
-            items:
-              - key: 00.settings.py
-                path: 00.settings.py
-
-        - name: database
-          secret:
-            secretName: database
-            items:
-              - key: 20.database.py
-                path: 20.database.py
+          projected:
+            sources:
+              - configMap:
+                  name: configuration
+                  items:
+                    - key: 00.settings.py
+                      path: 00.settings.py
+              - secret:
+                  name: celery-broker
+                  items:
+                    - key: 10.celery-broker.py
+                      path: 10.celery-broker.py
+              - secret:
+                  name: database
+                  items:
+                    - key: 20.database.py
+                      path: 20.database.py
 
         - name: logs
           hostPath:

manifests/centurion_erp/base/kustomization.yaml

@@ -5,9 +5,9 @@ kind: Kustomization
 configMapGenerator:
   - name: configuration
     files:
-      - 80.csrf.py
       - 00.settings.py
       - 15.ui-redirect.py
+      - 80.csrf.py
 
 generatorOptions:
   disableNameSuffixHash: true
@@ -39,7 +39,7 @@ resources:
   - Service-api.yaml
 
 secretGenerator:
-  - name: secret_key
+  - name: secret-key
     files:
       - 90.secret_key.py
 

manifests/centurion_erp/components/sso-keycloak/kustomization.yaml

@@ -9,30 +9,18 @@ generatorOptions:
 namespace: centurion
 
 secretGenerator:
-  - name: social_auth_keycloak
+  - name: social-auth-keycloak
     files:
       - 70.social_auth_keycloak.py
 
 patches:
 
   - patch: |-
       - op: add
-        path: /spec/template/spec/containers/0/volumeMounts/-
+        path: /spec/template/spec/volumes/0/projected/sources/-
         value:
-          name: social-auth-keycloak
-          mountPath: /etc/itsm/social_auth_keycloak.py
-          subPath: social_auth_keycloak.py
-          readOnly: true
-
-      - op: add
-        path: /spec/template/spec/volumes/-
-        value:
-          name: social-auth-keycloak
-          configMap:
+          secret:
             name: social-auth-keycloak
-            items:
-              - key: social_auth_keycloak.py
-                path: social_auth_keycloak.py
 
     target:
       kind: Deployment