From eb7b4e9e78f7caaac8d338b00a0f1f1a584f44a4 Mon Sep 17 00:00:00 2001 From: Arthur Wiebe Date: Tue, 11 Jun 2019 15:30:13 +0000 Subject: [PATCH 1/3] fix bug when using external redis without password --- charts/gitlab/charts/mailroom/templates/configmap.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/gitlab/charts/mailroom/templates/configmap.yaml b/charts/gitlab/charts/mailroom/templates/configmap.yaml index ec48f7245d..5a39c26069 100644 --- a/charts/gitlab/charts/mailroom/templates/configmap.yaml +++ b/charts/gitlab/charts/mailroom/templates/configmap.yaml @@ -23,7 +23,11 @@ data: :delivery_method: sidekiq {{- end }} :delivery_options: + {{- if .Values.global.redis.password.enabled }} :redis_url: {{ template "gitlab.redis.scheme" . }}://:<%= File.read("/etc/gitlab/redis/password") %>@{{ template "gitlab.redis.host" . }}:{{ template "gitlab.redis.port" . }} + {{- else }} + :redis_url: {{ template "gitlab.redis.scheme" . }}://{{ template "gitlab.redis.host" . }}:{{ template "gitlab.redis.port" . }} + {{- end }} :namespace: resque:gitlab :queue: email_receiver :worker: EmailReceiverWorker -- GitLab From 4752ee0b1a1c3fbabdbf6282c8b841aa2e5f3a60 Mon Sep 17 00:00:00 2001 From: Arthur Wiebe Date: Tue, 11 Jun 2019 16:06:21 +0000 Subject: [PATCH 2/3] use gitlab.redis.url for delivery redis_url --- charts/gitlab/charts/mailroom/templates/configmap.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/charts/gitlab/charts/mailroom/templates/configmap.yaml b/charts/gitlab/charts/mailroom/templates/configmap.yaml index 5a39c26069..97dba582f7 100644 --- a/charts/gitlab/charts/mailroom/templates/configmap.yaml +++ b/charts/gitlab/charts/mailroom/templates/configmap.yaml @@ -23,11 +23,7 @@ data: :delivery_method: sidekiq {{- end }} :delivery_options: - {{- if .Values.global.redis.password.enabled }} - :redis_url: {{ template "gitlab.redis.scheme" . }}://:<%= File.read("/etc/gitlab/redis/password") %>@{{ template "gitlab.redis.host" . }}:{{ template "gitlab.redis.port" . }} - {{- else }} - :redis_url: {{ template "gitlab.redis.scheme" . }}://{{ template "gitlab.redis.host" . }}:{{ template "gitlab.redis.port" . }} - {{- end }} + :redis_url: {{ template "gitlab.redis.url" . }} :namespace: resque:gitlab :queue: email_receiver :worker: EmailReceiverWorker -- GitLab From dfbd5506c10dc3060fd11665f773798129ff7c6d Mon Sep 17 00:00:00 2001 From: Jason Plum Date: Mon, 1 Jul 2019 21:28:06 +0000 Subject: [PATCH 3/3] Add changelog for !816 --- changelogs/unreleased/816-mailroom-fix-redis-no-password.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/816-mailroom-fix-redis-no-password.yml diff --git a/changelogs/unreleased/816-mailroom-fix-redis-no-password.yml b/changelogs/unreleased/816-mailroom-fix-redis-no-password.yml new file mode 100644 index 0000000000..3f45b8d98a --- /dev/null +++ b/changelogs/unreleased/816-mailroom-fix-redis-no-password.yml @@ -0,0 +1,5 @@ +--- +title: 'Mailroom: fix redis without passsword' +merge_request: 816 +author: arthur13 +type: fixed \ No newline at end of file -- GitLab