From edd856df7d90d601b0f5269500f2abdad143f3b7 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Mon, 11 Mar 2019 20:46:19 +0100 Subject: [PATCH] redis -> rabbitmq --- debian/control | 2 +- helm/passbook/charts/rabbitmq-4.3.2.tgz | Bin 0 -> 12448 bytes helm/passbook/requirements.lock | 8 ++++---- helm/passbook/requirements.yaml | 4 ++-- helm/passbook/templates/passbook-configmap.yaml | 2 +- helm/passbook/values.yaml | 9 ++++++--- passbook/core/requirements.txt | 1 - passbook/core/settings.py | 5 +++-- passbook/lib/default.yml | 2 +- 9 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 helm/passbook/charts/rabbitmq-4.3.2.tgz diff --git a/debian/control b/debian/control index 79f149f37..41f1bc431 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.9.6 Package: passbook Architecture: all -Recommends: mysql-server, redis-server +Recommends: mysql-server, rabbitmq-server Pre-Depends: adduser, libldap2-dev, libsasl2-dev Depends: python3 (>= 3.5) | python3.6 | python3.7, python3-pip, dbconfig-pgsql | dbconfig-no-thanks, ${misc:Depends} Description: Authentication Provider/Proxy supporting protocols like SAML, OAuth, LDAP and more. diff --git a/helm/passbook/charts/rabbitmq-4.3.2.tgz b/helm/passbook/charts/rabbitmq-4.3.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..c41057755256e40aa501a3d3a4a44ab9b4495891 GIT binary patch literal 12448 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 literal 0 HcmV?d00001 diff --git a/helm/passbook/requirements.lock b/helm/passbook/requirements.lock index 8457a7c56..e0d0da107 100644 --- a/helm/passbook/requirements.lock +++ b/helm/passbook/requirements.lock @@ -1,9 +1,9 @@ dependencies: -- name: redis +- name: rabbitmq repository: https://kubernetes-charts.storage.googleapis.com/ - version: 5.1.0 + version: 4.3.2 - name: postgresql repository: https://kubernetes-charts.storage.googleapis.com/ version: 3.10.1 -digest: sha256:04bd136761f070e94a2ff32ff48ff87f5e07fbd451e5fd7f65551e3bd4680e5e -generated: 2019-02-08T12:08:49.090666+01:00 +digest: sha256:c36e054785f7d706d7d3f525eb1b167dbc89b42f84da7fc167a18bbb6542c999 +generated: 2019-03-11T20:36:35.125079+01:00 diff --git a/helm/passbook/requirements.yaml b/helm/passbook/requirements.yaml index 0d5a7feea..9ae71eac5 100644 --- a/helm/passbook/requirements.yaml +++ b/helm/passbook/requirements.yaml @@ -1,6 +1,6 @@ dependencies: -- name: redis - version: 5.1.0 +- name: rabbitmq + version: 4.3.2 repository: https://kubernetes-charts.storage.googleapis.com/ - name: postgresql version: 3.10.1 diff --git a/helm/passbook/templates/passbook-configmap.yaml b/helm/passbook/templates/passbook-configmap.yaml index f37ddde27..9087373e1 100644 --- a/helm/passbook/templates/passbook-configmap.yaml +++ b/helm/passbook/templates/passbook-configmap.yaml @@ -36,7 +36,7 @@ data: debug: false secure_proxy_header: HTTP_X_FORWARDED_PROTO: https - redis: ":{{ .Values.redis.password }}@{{ .Release.Name }}-redis-master" + rabbitmq: "user:{{ .Values.rabbitmq.rabbitmq.password }}@{{ .Release.Name }}-rabbitmq-master" # Error reporting, sends stacktrace to sentry.services.beryju.org error_report_enabled: {{ .Values.config.error_reporting }} diff --git a/helm/passbook/values.yaml b/helm/passbook/values.yaml index 362defea2..ec040c985 100644 --- a/helm/passbook/values.yaml +++ b/helm/passbook/values.yaml @@ -18,8 +18,12 @@ config: host: localhost postgresql: - postgresqlDatabase: passbook - postgresqlPassword: foo + postgresqlDatabase: passbook + postgresqlPassword: foo + +rabbitmq: + rabbitmq: + password: foo service: type: ClusterIP @@ -33,7 +37,6 @@ ingress: path: / hosts: - passbook.k8s.local - - kubernetes-healthcheck-host defaultHost: passbook.k8s.local tls: [] # - secretName: chart-example-tls diff --git a/passbook/core/requirements.txt b/passbook/core/requirements.txt index 388f39bfe..dea78258c 100644 --- a/passbook/core/requirements.txt +++ b/passbook/core/requirements.txt @@ -7,7 +7,6 @@ raven markdown colorlog celery -redis psycopg2 idna<2.8,>=2.5 cherrypy diff --git a/passbook/core/settings.py b/passbook/core/settings.py index e05247a3b..0b0585761 100644 --- a/passbook/core/settings.py +++ b/passbook/core/settings.py @@ -184,8 +184,9 @@ CELERY_TIMEZONE = TIME_ZONE CELERY_BEAT_SCHEDULE = {} CELERY_CREATE_MISSING_QUEUES = True CELERY_TASK_DEFAULT_QUEUE = 'passbook' -CELERY_BROKER_URL = 'redis://%s' % CONFIG.get('redis') -CELERY_RESULT_BACKEND = 'redis://%s' % CONFIG.get('redis') +CELERY_BROKER_URL = 'amqp://%s' % CONFIG.get('rabbitmq') +CELERY_RESULT_BACKEND = 'rpc://' +CELERY_ACKS_LATE = True # Raven settings RAVEN_CONFIG = { diff --git a/passbook/lib/default.yml b/passbook/lib/default.yml index ce1a05797..564609625 100644 --- a/passbook/lib/default.yml +++ b/passbook/lib/default.yml @@ -29,7 +29,7 @@ web: debug: false secure_proxy_header: HTTP_X_FORWARDED_PROTO: https -redis: localhost +rabbitmq: guest:guest@localhost/passbook # Error reporting, sends stacktrace to sentry.services.beryju.org error_report_enabled: true secret_key: 9$@r!d^1^jrn#fk#1#@ks#9&i$^s#1)_13%$rwjrhd=e8jfi_s