Merge remote-tracking branch 'origin/master' into nightly

overhangio · Dec 9, 2023 · d313fe9 · d313fe9
2 parents 49f8837 + 0198510
commit d313fe9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,11 @@ instructions, because git commits are used to generate release notes:
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-16.0.2'></a>
+## v16.0.2 (2023-12-09)
+
+[Bugfix] Mounted settings in kubernetes. (by @hoffmannkrzysztof)
+
 <a id='changelog-16.0.1'></a>
 ## v16.0.1 (2023-12-08)
 

diff --git a/tutorecommerce/__about__.py b/tutorecommerce/__about__.py
@@ -1 +1 @@
-__version__ = "16.0.1"
+__version__ = "16.0.2"
diff --git a/tutorecommerce/patches/k8s-deployments b/tutorecommerce/patches/k8s-deployments
@@ -26,9 +26,8 @@ spec:
             - name: DJANGO_SETTINGS_MODULE
               value: ecommerce.settings.tutor.production
           volumeMounts:
-            - mountPath: /openedx/ecommerce/ecommerce/settings/tutor/production.py
+            - mountPath: /openedx/ecommerce/ecommerce/settings/tutor/
               name: settings
-              subPath: production.py
           securityContext:
             allowPrivilegeEscalation: false
       volumes:
@@ -65,9 +64,8 @@ spec:
             - name: C_FORCE_ROOT
               value: "1"
           volumeMounts:
-            - mountPath: /openedx/ecommerce_worker/ecommerce_worker/configuration/tutor/production.py
+            - mountPath: /openedx/ecommerce_worker/ecommerce_worker/configuration/tutor/
               name: settings
-              subPath: production.py
           securityContext:
             allowPrivilegeEscalation: false
       volumes:

diff --git a/tutorecommerce/patches/k8s-jobs b/tutorecommerce/patches/k8s-jobs
@@ -16,10 +16,9 @@ spec:
             - name: DJANGO_SETTINGS_MODULE
               value: ecommerce.settings.tutor.production
           volumeMounts:
-            - mountPath: /openedx/ecommerce/ecommerce/settings/tutor/production.py
+            - mountPath: /openedx/ecommerce/ecommerce/settings/tutor/
               name: settings
-              subPath: production.py
       volumes:
         - name: settings
           configMap:
-            name: ecommerce-settings
+            name: ecommerce-settings
diff --git a/tutorecommerce/patches/kustomization-configmapgenerator b/tutorecommerce/patches/kustomization-configmapgenerator
@@ -1,6 +1,6 @@
 - name: ecommerce-settings
-  files:
-    - plugins/ecommerce/apps/ecommerce/settings/production.py
+  files:{% for file in "ecommerce/apps/ecommerce/settings"|walk_templates %}
+  - plugins/{{ file }}{% endfor %}
 - name: ecommerce-worker-settings
-  files:
-    - plugins/ecommerce/apps/ecommerce-worker/settings/production.py
+  files:{% for file in "ecommerce/apps/ecommerce-worker/settings"|walk_templates %}
+  - plugins/{{ file }}{% endfor %}