fix: correctly mount pythonpath module

fix: deduplicate mount volume name
openedx · Sep 30, 2024 · ea90a73 · ea90a73
1 parent 404d974
commit ea90a73
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/tutoraspects/patches/k8s-deployments b/tutoraspects/patches/k8s-deployments
@@ -216,6 +216,8 @@ spec:
               name: docker
             - mountPath: /app/pythonpath
               name: pythonpath
+            - mountPath: /app/pythonpath/openedx
+              name: pythonpath-openedx
             - mountPath: /app/security
               name: security
       volumes:
@@ -225,6 +227,9 @@ spec:
         - name: pythonpath
           configMap:
             name: superset-pythonpath
+        - name: pythonpath-openedx
+          configMap:
+            name: superset-pythonpath-openedx
         - name: security
           configMap:
             name: superset-security
@@ -305,6 +310,8 @@ spec:
               name: docker
             - mountPath: /app/pythonpath
               name: pythonpath
+            - mountPath: /app/pythonpath/openedx
+              name: pythonpath-openedx
             - mountPath: /app/security
               name: security
             - mountPath: /app/scripts
@@ -316,6 +323,9 @@ spec:
         - name: pythonpath
           configMap:
             name: superset-pythonpath
+        - name: pythonpath-openedx
+          configMap:
+            name: superset-pythonpath-openedx
         - name: security
           configMap:
             name: superset-security
@@ -399,6 +409,8 @@ spec:
               name: docker
             - mountPath: /app/pythonpath
               name: pythonpath
+            - mountPath: /app/pythonpath/openedx
+              name: pythonpath-openedx
             - mountPath: /app/security
               name: security
       volumes:
@@ -408,6 +420,9 @@ spec:
         - name: pythonpath
           configMap:
             name: superset-pythonpath
+        - name: pythonpath-openedx
+          configMap:
+            name: superset-pythonpath-openedx
         - name: security
           configMap:
             name: superset-security

diff --git a/tutoraspects/patches/k8s-jobs b/tutoraspects/patches/k8s-jobs
@@ -162,6 +162,8 @@ spec:
             name: docker
           - mountPath: /app/pythonpath
             name: pythonpath
+          - mountPath: /app/pythonpath/openedx
+            name: pythonpath-openedx
           - mountPath: /app/security
             name: security
           - mountPath: /app/assets
@@ -175,6 +177,9 @@ spec:
         - name: pythonpath
           configMap:
             name: superset-pythonpath
+        - name: pythonpath-openedx
+          configMap:
+            name: superset-pythonpath-openedx
         - name: security
           configMap:
             name: superset-security
@@ -246,6 +251,8 @@ spec:
               name: docker
             - mountPath: /app/pythonpath
               name: pythonpath
+            - mountPath: /app/pythonpath/openedx
+              name: pythonpath-openedx
             - mountPath: /app/security
               name: security
             - mountPath: /app/assets
@@ -257,6 +264,9 @@ spec:
         - name: pythonpath
           configMap:
             name: superset-pythonpath
+        - name: pythonpath-openedx
+          configMap:
+            name: superset-pythonpath-openedx
         - name: security
           configMap:
             name: superset-security

diff --git a/tutoraspects/patches/kustomization-configmapgenerator b/tutoraspects/patches/kustomization-configmapgenerator
@@ -74,7 +74,14 @@
         app.kubernetes.io/name: superset
 
 - name: superset-pythonpath
-  files:{% for file in "aspects/apps/superset/pythonpath"|walk_templates %}
+  files:{% for file in "aspects/apps/superset/pythonpath/"|walk_templates %}
+  - plugins/{{ file }}{% endfor %}
+  options:
+    labels:
+        app.kubernetes.io/name: superset
+
+- name: superset-pythonpath-openedx
+  files:{% for file in "aspects/apps/superset/pythonpath/openedx/"|walk_templates %}
   - plugins/{{ file }}{% endfor %}
   options:
     labels: