From 9f8b4a232499a2cd3e91ae5ffbb6e6f110c64433 Mon Sep 17 00:00:00 2001 From: Pablo Date: Fri, 9 Sep 2022 10:46:02 -0600 Subject: [PATCH 1/2] feat: use SSL --- templates/diffgram_settings.tpl | 1 + templates/postgres/service.yaml | 3 ++- values.yaml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/diffgram_settings.tpl b/templates/diffgram_settings.tpl index fbd1de3..e84adb0 100644 --- a/templates/diffgram_settings.tpl +++ b/templates/diffgram_settings.tpl @@ -40,6 +40,7 @@ DIFFGRAM_MINIO_DISABLED_SSL_VERIFY: {{.Values.diffgramSettings.DIFFGRAM_MINIO_DISABLED_SSL_VERIFY}} RABBITMQ_HOST: {{.Values.diffgramSettings.RABBITMQ_HOST}} RABBITMQ_PORT: {{.Values.diffgramSettings.RABBITMQ_PORT}} + RABBITMQ_USE_SSL: {{.Values.diffgramSettings.RABBITMQ_USE_SSL}} RABBITMQ_DEFAULT_USER: {{.Values.rabbitmq.auth.username}} USE_OAUTH2: {{.Values.diffgramSettings.USE_OAUTH2}} OAUTH2_PROVIDER_NAME: {{.Values.diffgramSettings.OAUTH2_PROVIDER_NAME}} diff --git a/templates/postgres/service.yaml b/templates/postgres/service.yaml index 2b3435c..cce62cc 100644 --- a/templates/postgres/service.yaml +++ b/templates/postgres/service.yaml @@ -15,4 +15,5 @@ spec: - port: 5432 selector: app: postgres -{{ end }} \ No newline at end of file +{{ end }} + diff --git a/values.yaml b/values.yaml index 95dace4..f06ff68 100644 --- a/values.yaml +++ b/values.yaml @@ -102,6 +102,7 @@ diffgramSettings: DIFFGRAM_MINIO_DISABLED_SSL_VERIFY: '"False"' RABBITMQ_PORT: "'5672'" RABBITMQ_HOST: "diffgram-rabbitmq" + RABBITMQ_USE_SSL: '"False"' SIGNED_URL_CACHE_MINIMUM_DAYS_VALID: "'5'" SIGNED_URL_CACHE_NEW_OFFSET_DAYS_VALID: "'6'" @@ -129,6 +130,7 @@ imagePullCredentials: ####### Dependencies # Read: https://github.com/bitnami/charts/tree/master/bitnami/rabbitmq for further configs useRabbitMq: true +hostedRabbitUrl: null rabbitmq: auth: username: "diffgram" From ded4ef92713ede53eaccefba2912ee9df2c9feff Mon Sep 17 00:00:00 2001 From: Pablo Date: Fri, 9 Sep 2022 10:47:15 -0600 Subject: [PATCH 2/2] fix: remove url, for future pr --- values.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/values.yaml b/values.yaml index f06ff68..965dcd6 100644 --- a/values.yaml +++ b/values.yaml @@ -130,7 +130,6 @@ imagePullCredentials: ####### Dependencies # Read: https://github.com/bitnami/charts/tree/master/bitnami/rabbitmq for further configs useRabbitMq: true -hostedRabbitUrl: null rabbitmq: auth: username: "diffgram"