diff --git a/chart/templates/cronjob-db-dump.yaml b/chart/templates/cronjob-db-dump.yaml index 0ac647496a3e7c6d0a4e0eea41e15911270f2d65..3afc2d189d87c33e5f73efcba54c0219303f2dc0 100644 --- a/chart/templates/cronjob-db-dump.yaml +++ b/chart/templates/cronjob-db-dump.yaml @@ -36,9 +36,14 @@ spec: name: {{ .Release.Name }}-postgresql key: 'postgres-password' volumeMounts: + - name: server-static + mountPath: /code/.static.shared - name: persistent-storage - mountPath: /code/persistent_volume + mountPath: /code/persistent_volume │ + subPath: persistent_volume volumes: + - name: server-static + emptyDir: {} - name: persistent-storage persistentVolumeClaim: claimName: {{ include "chart.fullname" . }} diff --git a/chart/templates/cronjobs-send-edition-notification.yaml b/chart/templates/cronjobs-send-edition-notification.yaml index 14ca8a58b60704e09fa40e3fd2cd52b54e29d89e..660964196e116a02d3da5b3a1efddf4302ff9978 100644 --- a/chart/templates/cronjobs-send-edition-notification.yaml +++ b/chart/templates/cronjobs-send-edition-notification.yaml @@ -39,10 +39,14 @@ spec: name: {{ .Release.Name }}-postgresql key: 'postgres-password' volumeMounts: + - name: server-static + mountPath: /code/.static.shared - name: persistent-storage - mountPath: /code/persistent_volume + mountPath: /code/persistent_volume │ subPath: persistent_volume volumes: + - name: server-static + emptyDir: {} - name: persistent-storage persistentVolumeClaim: claimName: {{ include "chart.fullname" . }} diff --git a/chart/templates/cronjobs-trim-backups-history.yaml b/chart/templates/cronjobs-trim-backups-history.yaml index 576691951f03c15537c69458be448cffc455aeae..c2d56c22a59acfc50e3784106e73303c1f2b275e 100644 --- a/chart/templates/cronjobs-trim-backups-history.yaml +++ b/chart/templates/cronjobs-trim-backups-history.yaml @@ -38,10 +38,14 @@ spec: name: {{ .Release.Name }}-postgresql key: 'postgres-password' volumeMounts: + - name: server-static + mountPath: /code/.static.shared - name: persistent-storage - mountPath: /code/persistent_volume + mountPath: /code/persistent_volume │ subPath: persistent_volume volumes: + - name: server-static + emptyDir: {} - name: persistent-storage persistentVolumeClaim: claimName: {{ include "chart.fullname" . }} diff --git a/src/viralhostrange/requirements.txt b/src/viralhostrange/requirements.txt index 99dc0619d0182991808fca3fdb3bc5f8c17d42c6..5f113700fc6f8eb056273b53c3ff6cd1347c3937 100644 --- a/src/viralhostrange/requirements.txt +++ b/src/viralhostrange/requirements.txt @@ -21,6 +21,5 @@ scikit-learn<=1.0.2 django-colorfield pyexcel-ezodf biopython -huey --extra-index-url https://gitlab.pasteur.fr/api/v4/projects/hub%2Fdjango-kubernetes-probes/packages/pypi/simple django-kubernetes-probes diff --git a/src/viralhostrange/viralhostrange/settings.py b/src/viralhostrange/viralhostrange/settings.py index 04b583d2d8e2290d5f1a5cb49505ab94989b4fc6..fc2c299c6adffac3991b23c3c3f5d26282d729b4 100644 --- a/src/viralhostrange/viralhostrange/settings.py +++ b/src/viralhostrange/viralhostrange/settings.py @@ -55,13 +55,13 @@ INSTALLED_APPS = [ 'basetheme_bootstrap', 'django.contrib.admin', 'colorfield', - 'huey.contrib.djhuey', + # 'huey.contrib.djhuey', 'viralhostrangedb', 'django_kubernetes_probes', 'django.contrib.sitemaps', ] -if config('PREVENT_HUEY', default=False, cast=bool): - INSTALLED_APPS.remove('huey.contrib.djhuey') +# if config('PREVENT_HUEY', default=False, cast=bool): +# INSTALLED_APPS.remove('huey.contrib.djhuey') # INSTALLED_APPS.append('django_extensions') @@ -308,18 +308,18 @@ DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' ################################################################################ # HUEY ################################################################################ -HUEY = { - 'name': str(DATABASES['default']['NAME']), - 'huey_class': 'huey.SqliteHuey', - 'immediate': config('HUEY_IMMEDIATE', default=DEBUG, cast=bool), - 'consumer': { - 'blocking': True, - 'loglevel': logging.DEBUG, - 'workers': 1, - 'scheduler_interval': 1, - 'simple_log': True, - }, - 'filename': os.path.join(PERSISTENT_VOLUME, 'huey.sqlite3'), -} +# HUEY = { +# 'name': str(DATABASES['default']['NAME']), +# 'huey_class': 'huey.SqliteHuey', +# 'immediate': config('HUEY_IMMEDIATE', default=DEBUG, cast=bool), +# 'consumer': { +# 'blocking': True, +# 'loglevel': logging.DEBUG, +# 'workers': 1, +# 'scheduler_interval': 1, +# 'simple_log': True, +# }, +# 'filename': os.path.join(PERSISTENT_VOLUME, 'huey.sqlite3'), +# } ################################################################################