From 1a2d7f96b4c01d8174e10b3886891e0ee995cc21 Mon Sep 17 00:00:00 2001
From: Krzysztof Hoffmann <krzysztof.hoffmann@increase.pl>
Date: Sat, 9 Dec 2023 19:04:58 +0100
Subject: [PATCH] fix: missing settings in k8s

---
 changelog.d/20231209_161942_krzysiekpl.md               | 1 +
 tutorecommerce/patches/k8s-deployments                  | 6 ++----
 tutorecommerce/patches/k8s-jobs                         | 5 ++---
 tutorecommerce/patches/kustomization-configmapgenerator | 8 ++++----
 4 files changed, 9 insertions(+), 11 deletions(-)
 create mode 100644 changelog.d/20231209_161942_krzysiekpl.md

diff --git a/changelog.d/20231209_161942_krzysiekpl.md b/changelog.d/20231209_161942_krzysiekpl.md
new file mode 100644
index 00000000..f866c283
--- /dev/null
+++ b/changelog.d/20231209_161942_krzysiekpl.md
@@ -0,0 +1 @@
+[Fix] Change mounting volumes entries for ecommerce and worker while using k8s setup. (by @hoffmannkrzysztof)
diff --git a/tutorecommerce/patches/k8s-deployments b/tutorecommerce/patches/k8s-deployments
index 27041f2f..bc806b35 100644
--- 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
index e1852e5e..ef5cb8a1 100644
--- 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
\ No newline at end of file
+            name: ecommerce-settings
diff --git a/tutorecommerce/patches/kustomization-configmapgenerator b/tutorecommerce/patches/kustomization-configmapgenerator
index 3ede00d4..6c1537fb 100644
--- 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
\ No newline at end of file
+  files:{% for file in "ecommerce/apps/ecommerce-worker/settings"|walk_templates %}
+  - plugins/{{ file }}{% endfor %}