Commit 5608c54b authored by Lauri Himanen's avatar Lauri Himanen
Browse files

Got rid of redis dependencies in charts.

parent f3430324
Pipeline #74083 passed with stages
in 23 minutes and 18 seconds
......@@ -87,20 +87,11 @@ rabbitmq = NomadConfig(
password='rabbitmq'
)
redis = NomadConfig(
host='localhost',
port=6379,
)
def rabbitmq_url():
return 'pyamqp://%s:%s@%s//' % (rabbitmq.user, rabbitmq.password, rabbitmq.host)
def redis_url():
return 'redis://%s:%d/0' % (redis.host, redis.port)
celery = NomadConfig(
max_memory=64e6, # 64 GB
timeout=1800, # 1/2 h
......
......@@ -26,12 +26,6 @@ services:
ports:
- 5672:5672
# backend for celery
redis:
restart: 'no'
ports:
- 6379:6379
# the search engine
elastic:
restart: 'no'
......
......@@ -46,13 +46,6 @@ services:
volumes:
- nomad_rabbitmq:/var/lib/rabbitmq
# result backend for celery
redis:
restart: unless-stopped
image: redis:5.0.8-alpine
container_name: nomad_redis
command: [sh, -c, "rm -f /data/dump.rdb && redis-server --save ''"] # Disables db persistence to disk
# the search engine
elastic:
restart: always
......
......@@ -2,6 +2,3 @@ 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"
......@@ -29,8 +29,6 @@ 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 }}
......
......@@ -100,18 +100,6 @@ 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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment