From a7d51d7c6b233bb0e88629611c8f88a0c33520f6 Mon Sep 17 00:00:00 2001 From: JacquesDurand <59364973+JacquesDurand@users.noreply.github.com> Date: Fri, 4 Oct 2024 15:15:14 +0200 Subject: [PATCH] fix: add missing env vars to cronjobs (#750) --- .../cronjobs/cronjobEndMembership.yaml | 22 +++++++++++++++++ .../cronjobEndPlatformMembership.yaml | 24 ++++++++++++++++++- .../cronjobNotifyMembershipExpiration1.yaml | 22 +++++++++++++++++ .../cronjobNotifyMembershipExpiration7.yaml | 22 +++++++++++++++++ ...obNotifyPlatformMembershipExpiration1.yaml | 22 +++++++++++++++++ ...obNotifyPlatformMembershipExpiration7.yaml | 22 +++++++++++++++++ .../cronjobNotifyServiceRequestDatesEnd.yaml | 22 +++++++++++++++++ ...cronjobNotifyServiceRequestDatesStart.yaml | 22 +++++++++++++++++ 8 files changed, 177 insertions(+), 1 deletion(-) diff --git a/helm/chart/templates/cronjobs/cronjobEndMembership.yaml b/helm/chart/templates/cronjobs/cronjobEndMembership.yaml index e94f215..bf5736c 100644 --- a/helm/chart/templates/cronjobs/cronjobEndMembership.yaml +++ b/helm/chart/templates/cronjobs/cronjobEndMembership.yaml @@ -78,6 +78,23 @@ spec: secretKeyRef: name: {{ include "plateforme-ebs" . }} key: database-url + - name: MAILER_DSN + valueFrom: + secretKeyRef: + name: {{ include "plateforme-ebs" . }} + key: mailer-dsn + {{- if .Values.meilisearch.enabled }} + - name: MEILISEARCH_API_KEY + valueFrom: + secretKeyRef: + name: {{ printf "%s-%s" (include "meilisearch.fullname" .Subcharts.meilisearch ) "master-key" }} + key: MEILI_MASTER_KEY + - name: MEILISEARCH_URL + valueFrom: + configMapKeyRef: + name: {{ include "plateforme-ebs" . }} + key: meilisearch-url + {{- end }} - name: MERCURE_URL valueFrom: configMapKeyRef: @@ -93,6 +110,11 @@ spec: secretKeyRef: name: {{ include "plateforme-ebs" . }} key: mercure-jwt-secret + - name: SMS_DSN + valueFrom: + secretKeyRef: + name: {{ include "plateforme-ebs" . }} + key: sms-dsn - name: STORAGE_BUCKET valueFrom: configMapKeyRef: diff --git a/helm/chart/templates/cronjobs/cronjobEndPlatformMembership.yaml b/helm/chart/templates/cronjobs/cronjobEndPlatformMembership.yaml index 87632ec..4c9473b 100644 --- a/helm/chart/templates/cronjobs/cronjobEndPlatformMembership.yaml +++ b/helm/chart/templates/cronjobs/cronjobEndPlatformMembership.yaml @@ -6,7 +6,7 @@ metadata: labels: {{- include "plateforme-ebs.labels" . | nindent 4 }} spec: - schedule: '30 10 * * *' + schedule: '45 15 * * *' jobTemplate: metadata: annotations: @@ -78,6 +78,23 @@ spec: secretKeyRef: name: {{ include "plateforme-ebs" . }} key: database-url + - name: MAILER_DSN + valueFrom: + secretKeyRef: + name: {{ include "plateforme-ebs" . }} + key: mailer-dsn + {{- if .Values.meilisearch.enabled }} + - name: MEILISEARCH_API_KEY + valueFrom: + secretKeyRef: + name: {{ printf "%s-%s" (include "meilisearch.fullname" .Subcharts.meilisearch ) "master-key" }} + key: MEILI_MASTER_KEY + - name: MEILISEARCH_URL + valueFrom: + configMapKeyRef: + name: {{ include "plateforme-ebs" . }} + key: meilisearch-url + {{- end }} - name: MERCURE_URL valueFrom: configMapKeyRef: @@ -93,6 +110,11 @@ spec: secretKeyRef: name: {{ include "plateforme-ebs" . }} key: mercure-jwt-secret + - name: SMS_DSN + valueFrom: + secretKeyRef: + name: {{ include "plateforme-ebs" . }} + key: sms-dsn - name: STORAGE_BUCKET valueFrom: configMapKeyRef: diff --git a/helm/chart/templates/cronjobs/cronjobNotifyMembershipExpiration1.yaml b/helm/chart/templates/cronjobs/cronjobNotifyMembershipExpiration1.yaml index e7324b0..6a14ec0 100644 --- a/helm/chart/templates/cronjobs/cronjobNotifyMembershipExpiration1.yaml +++ b/helm/chart/templates/cronjobs/cronjobNotifyMembershipExpiration1.yaml @@ -78,6 +78,23 @@ spec: secretKeyRef: name: {{ include "plateforme-ebs" . }} key: database-url + - name: MAILER_DSN + valueFrom: + secretKeyRef: + name: {{ include "plateforme-ebs" . }} + key: mailer-dsn + {{- if .Values.meilisearch.enabled }} + - name: MEILISEARCH_API_KEY + valueFrom: + secretKeyRef: + name: {{ printf "%s-%s" (include "meilisearch.fullname" .Subcharts.meilisearch ) "master-key" }} + key: MEILI_MASTER_KEY + - name: MEILISEARCH_URL + valueFrom: + configMapKeyRef: + name: {{ include "plateforme-ebs" . }} + key: meilisearch-url + {{- end }} - name: MERCURE_URL valueFrom: configMapKeyRef: @@ -93,6 +110,11 @@ spec: secretKeyRef: name: {{ include "plateforme-ebs" . }} key: mercure-jwt-secret + - name: SMS_DSN + valueFrom: + secretKeyRef: + name: {{ include "plateforme-ebs" . }} + key: sms-dsn - name: STORAGE_BUCKET valueFrom: configMapKeyRef: diff --git a/helm/chart/templates/cronjobs/cronjobNotifyMembershipExpiration7.yaml b/helm/chart/templates/cronjobs/cronjobNotifyMembershipExpiration7.yaml index 44f2f0e..f9b254f 100644 --- a/helm/chart/templates/cronjobs/cronjobNotifyMembershipExpiration7.yaml +++ b/helm/chart/templates/cronjobs/cronjobNotifyMembershipExpiration7.yaml @@ -78,6 +78,23 @@ spec: secretKeyRef: name: {{ include "plateforme-ebs" . }} key: database-url + - name: MAILER_DSN + valueFrom: + secretKeyRef: + name: {{ include "plateforme-ebs" . }} + key: mailer-dsn + {{- if .Values.meilisearch.enabled }} + - name: MEILISEARCH_API_KEY + valueFrom: + secretKeyRef: + name: {{ printf "%s-%s" (include "meilisearch.fullname" .Subcharts.meilisearch ) "master-key" }} + key: MEILI_MASTER_KEY + - name: MEILISEARCH_URL + valueFrom: + configMapKeyRef: + name: {{ include "plateforme-ebs" . }} + key: meilisearch-url + {{- end }} - name: MERCURE_URL valueFrom: configMapKeyRef: @@ -93,6 +110,11 @@ spec: secretKeyRef: name: {{ include "plateforme-ebs" . }} key: mercure-jwt-secret + - name: SMS_DSN + valueFrom: + secretKeyRef: + name: {{ include "plateforme-ebs" . }} + key: sms-dsn - name: STORAGE_BUCKET valueFrom: configMapKeyRef: diff --git a/helm/chart/templates/cronjobs/cronjobNotifyPlatformMembershipExpiration1.yaml b/helm/chart/templates/cronjobs/cronjobNotifyPlatformMembershipExpiration1.yaml index 1efc76d..e2be178 100644 --- a/helm/chart/templates/cronjobs/cronjobNotifyPlatformMembershipExpiration1.yaml +++ b/helm/chart/templates/cronjobs/cronjobNotifyPlatformMembershipExpiration1.yaml @@ -78,6 +78,23 @@ spec: secretKeyRef: name: {{ include "plateforme-ebs" . }} key: database-url + - name: MAILER_DSN + valueFrom: + secretKeyRef: + name: {{ include "plateforme-ebs" . }} + key: mailer-dsn + {{- if .Values.meilisearch.enabled }} + - name: MEILISEARCH_API_KEY + valueFrom: + secretKeyRef: + name: {{ printf "%s-%s" (include "meilisearch.fullname" .Subcharts.meilisearch ) "master-key" }} + key: MEILI_MASTER_KEY + - name: MEILISEARCH_URL + valueFrom: + configMapKeyRef: + name: {{ include "plateforme-ebs" . }} + key: meilisearch-url + {{- end }} - name: MERCURE_URL valueFrom: configMapKeyRef: @@ -93,6 +110,11 @@ spec: secretKeyRef: name: {{ include "plateforme-ebs" . }} key: mercure-jwt-secret + - name: SMS_DSN + valueFrom: + secretKeyRef: + name: {{ include "plateforme-ebs" . }} + key: sms-dsn - name: STORAGE_BUCKET valueFrom: configMapKeyRef: diff --git a/helm/chart/templates/cronjobs/cronjobNotifyPlatformMembershipExpiration7.yaml b/helm/chart/templates/cronjobs/cronjobNotifyPlatformMembershipExpiration7.yaml index 500a23e..1311c2d 100644 --- a/helm/chart/templates/cronjobs/cronjobNotifyPlatformMembershipExpiration7.yaml +++ b/helm/chart/templates/cronjobs/cronjobNotifyPlatformMembershipExpiration7.yaml @@ -78,6 +78,23 @@ spec: secretKeyRef: name: {{ include "plateforme-ebs" . }} key: database-url + - name: MAILER_DSN + valueFrom: + secretKeyRef: + name: {{ include "plateforme-ebs" . }} + key: mailer-dsn + {{- if .Values.meilisearch.enabled }} + - name: MEILISEARCH_API_KEY + valueFrom: + secretKeyRef: + name: {{ printf "%s-%s" (include "meilisearch.fullname" .Subcharts.meilisearch ) "master-key" }} + key: MEILI_MASTER_KEY + - name: MEILISEARCH_URL + valueFrom: + configMapKeyRef: + name: {{ include "plateforme-ebs" . }} + key: meilisearch-url + {{- end }} - name: MERCURE_URL valueFrom: configMapKeyRef: @@ -93,6 +110,11 @@ spec: secretKeyRef: name: {{ include "plateforme-ebs" . }} key: mercure-jwt-secret + - name: SMS_DSN + valueFrom: + secretKeyRef: + name: {{ include "plateforme-ebs" . }} + key: sms-dsn - name: STORAGE_BUCKET valueFrom: configMapKeyRef: diff --git a/helm/chart/templates/cronjobs/cronjobNotifyServiceRequestDatesEnd.yaml b/helm/chart/templates/cronjobs/cronjobNotifyServiceRequestDatesEnd.yaml index 19079e9..c2e0488 100644 --- a/helm/chart/templates/cronjobs/cronjobNotifyServiceRequestDatesEnd.yaml +++ b/helm/chart/templates/cronjobs/cronjobNotifyServiceRequestDatesEnd.yaml @@ -78,6 +78,23 @@ spec: secretKeyRef: name: {{ include "plateforme-ebs" . }} key: database-url + - name: MAILER_DSN + valueFrom: + secretKeyRef: + name: {{ include "plateforme-ebs" . }} + key: mailer-dsn + {{- if .Values.meilisearch.enabled }} + - name: MEILISEARCH_API_KEY + valueFrom: + secretKeyRef: + name: {{ printf "%s-%s" (include "meilisearch.fullname" .Subcharts.meilisearch ) "master-key" }} + key: MEILI_MASTER_KEY + - name: MEILISEARCH_URL + valueFrom: + configMapKeyRef: + name: {{ include "plateforme-ebs" . }} + key: meilisearch-url + {{- end }} - name: MERCURE_URL valueFrom: configMapKeyRef: @@ -93,6 +110,11 @@ spec: secretKeyRef: name: {{ include "plateforme-ebs" . }} key: mercure-jwt-secret + - name: SMS_DSN + valueFrom: + secretKeyRef: + name: {{ include "plateforme-ebs" . }} + key: sms-dsn - name: STORAGE_BUCKET valueFrom: configMapKeyRef: diff --git a/helm/chart/templates/cronjobs/cronjobNotifyServiceRequestDatesStart.yaml b/helm/chart/templates/cronjobs/cronjobNotifyServiceRequestDatesStart.yaml index 8b434c1..d8b6ae2 100644 --- a/helm/chart/templates/cronjobs/cronjobNotifyServiceRequestDatesStart.yaml +++ b/helm/chart/templates/cronjobs/cronjobNotifyServiceRequestDatesStart.yaml @@ -78,6 +78,23 @@ spec: secretKeyRef: name: {{ include "plateforme-ebs" . }} key: database-url + - name: MAILER_DSN + valueFrom: + secretKeyRef: + name: {{ include "plateforme-ebs" . }} + key: mailer-dsn + {{- if .Values.meilisearch.enabled }} + - name: MEILISEARCH_API_KEY + valueFrom: + secretKeyRef: + name: {{ printf "%s-%s" (include "meilisearch.fullname" .Subcharts.meilisearch ) "master-key" }} + key: MEILI_MASTER_KEY + - name: MEILISEARCH_URL + valueFrom: + configMapKeyRef: + name: {{ include "plateforme-ebs" . }} + key: meilisearch-url + {{- end }} - name: MERCURE_URL valueFrom: configMapKeyRef: @@ -93,6 +110,11 @@ spec: secretKeyRef: name: {{ include "plateforme-ebs" . }} key: mercure-jwt-secret + - name: SMS_DSN + valueFrom: + secretKeyRef: + name: {{ include "plateforme-ebs" . }} + key: sms-dsn - name: STORAGE_BUCKET valueFrom: configMapKeyRef: