Merge branch 'feature/align-auth-feature-mounts' into 'master'

Add features, auth and permissions mounts to api and worker deployments See merge request waldur/waldur-helm!309
waldur · Oct 8, 2023 · b2a42a4 · b2a42a4
2 parents 567557a + ee14863
commit b2a42a4
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/waldur/templates/deployment-api.yaml b/waldur/templates/deployment-api.yaml
@@ -68,6 +68,15 @@ spec:
             - name: api-celery
               mountPath: /etc/waldur/celery.conf
               subPath: celery.conf
+            - name: config-features-json
+              mountPath: /etc/waldur/features.json
+              subPath: features.json
+            - name: config-auth-yaml
+              mountPath: /etc/waldur/auth.yaml
+              subPath: auth.yaml
+            - name: config-permissions-yaml
+              mountPath: /etc/waldur/permissions.yaml
+              subPath: permissions.yaml
             - name: icons
               mountPath: /etc/waldur/icons
             {{ if has "SAML2" .Values.waldur.authMethods }}
@@ -104,6 +113,15 @@ spec:
       - name: api-celery
         configMap:
           name: api-celery-config
+      - name: config-features-json
+        configMap:
+          name: mastermind-config-features-json
+      - name: config-auth-yaml
+        configMap:
+          name: mastermind-config-auth-yaml
+      - name: config-permissions-yaml
+        configMap:
+          name: mastermind-config-permissions-yaml
       - name: icons
         configMap:
           name: icons-config

diff --git a/waldur/templates/deployment-worker.yaml b/waldur/templates/deployment-worker.yaml
@@ -68,6 +68,15 @@ spec:
             - name: api-celery
               mountPath: /etc/waldur/celery.conf
               subPath: celery.conf
+            - name: config-features-json
+              mountPath: /etc/waldur/features.json
+              subPath: features.json
+            - name: config-auth-yaml
+              mountPath: /etc/waldur/auth.yaml
+              subPath: auth.yaml
+            - name: config-permissions-yaml
+              mountPath: /etc/waldur/permissions.yaml
+              subPath: permissions.yaml
             {{ if has "VALIMO" .Values.waldur.authMethods }}
             - name: waldur-valimo-certs
               mountPath: /etc/waldur/valimo
@@ -95,6 +104,15 @@ spec:
       - name: api-celery
         configMap:
           name: api-celery-config
+      - name: config-features-json
+        configMap:
+          name: mastermind-config-features-json
+      - name: config-auth-yaml
+        configMap:
+          name: mastermind-config-auth-yaml
+      - name: config-permissions-yaml
+        configMap:
+          name: mastermind-config-permissions-yaml
       {{ if has "VALIMO" .Values.waldur.authMethods }}
       - name: waldur-valimo-certs
         secret: