diff --git a/nomad/processing/data.py b/nomad/processing/data.py index 7417e278c12264615fa09b7b26d07f727631a989..da49c7ad0b62ca9e75baaefea2c794e71ed70095 100644 --- a/nomad/processing/data.py +++ b/nomad/processing/data.py @@ -529,7 +529,8 @@ class Upload(Proc): meta: Any = { 'indexes': [ 'user_id', 'tasks_status', 'process_status', 'published', 'upload_time' - ] + ], + 'strict': False # ignore extra fields to support older entries with join related fields } def __init__(self, **kwargs): diff --git a/ops/helm/nomad/requirements.lock b/ops/helm/nomad/requirements.lock index acf87a452c409be23d65ee3064eba5893f60a878..07321f812cb2a6313117e7aa04a29175676fd3b5 100644 --- a/ops/helm/nomad/requirements.lock +++ b/ops/helm/nomad/requirements.lock @@ -2,5 +2,8 @@ dependencies: - name: rabbitmq repository: https://charts.bitnami.com/bitnami version: 6.21.0 -digest: sha256:71daa0c62bb26ed91bb50b8136f50e29d45b72510b668623f6713b4e52faa206 -generated: "2020-03-30T12:08:12.998147583+02:00" +- name: redis + repository: https://charts.bitnami.com/bitnami + version: 10.6.9 +digest: sha256:fce7e3be84b1e6b5ce8b3957fe9e68725fe65975a678d17ea47f6312e5ef45bb +generated: "2020-04-20T16:28:45.088829238+02:00" diff --git a/ops/helm/nomad/requirements.yaml b/ops/helm/nomad/requirements.yaml index 5a1951dda5c116d2788198d6ccc7b5f9b12f8013..72b108bcfbbdc1f3f7ffb6b028c1391b90dff0f1 100644 --- a/ops/helm/nomad/requirements.yaml +++ b/ops/helm/nomad/requirements.yaml @@ -2,3 +2,6 @@ dependencies: - name: rabbitmq version: "6.21.0" repository: "https://charts.bitnami.com/bitnami" +- name: redis + version: "10.6.9" + repository: "https://charts.bitnami.com/bitnami" diff --git a/ops/helm/nomad/templates/nomad-configmap.yml b/ops/helm/nomad/templates/nomad-configmap.yml index 3b3388fb6a2bf14b7f8b4b24dd841691127b5475..89ea87bfc20a22e5b6e175909a1a0118d16dd863 100644 --- a/ops/helm/nomad/templates/nomad-configmap.yml +++ b/ops/helm/nomad/templates/nomad-configmap.yml @@ -29,6 +29,8 @@ data: admin_user_id: {{ .Values.keycloak.admin_user_id }} rabbitmq: host: "{{ .Release.Name }}-rabbitmq" + redis: + host: "{{ .Release.Name }}-redis-master" elastic: host: "{{ .Values.elastic.host }}" port: {{ .Values.elastic.port }} diff --git a/ops/helm/nomad/values.yaml b/ops/helm/nomad/values.yaml index 7ca7a911600e35ee30025060b15ed880ba4a12d1..5a30cde95866f71666828eba46a751c80199941a 100644 --- a/ops/helm/nomad/values.yaml +++ b/ops/helm/nomad/values.yaml @@ -100,6 +100,18 @@ rabbitmq: password: rabbitmq erlangCookie: SWQOKODSQALRPCLNMEQG +## configuration of the chart dependency for redis +redis: + cluster: + enabled: false + usePassword: false + master: + nodeSelector: + nomadtype: public + persistence: + enabled: false + + ## A common name/prefix for all dbs and indices. dbname: fairdi_nomad_latest