From afa612d7bd5ca66f16cdd750e6a702caa8d754da Mon Sep 17 00:00:00 2001 From: golobitch Date: Thu, 2 May 2024 13:50:34 +0200 Subject: [PATCH 1/4] fix(backend): path to redis tls values --- charts/rafiki-backend/templates/configmap.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/rafiki-backend/templates/configmap.yaml b/charts/rafiki-backend/templates/configmap.yaml index 4bee681..9b7e767 100644 --- a/charts/rafiki-backend/templates/configmap.yaml +++ b/charts/rafiki-backend/templates/configmap.yaml @@ -29,9 +29,9 @@ data: PUBLIC_HOST: "{{ .Values.serviceUrls.PUBLIC_HOST }}" QUOTE_LIFESPAN: "{{ .Values.lifetime.quote }}" QUOTE_URL: "{{ .Values.serviceUrls.QUOTE_URL }}" - REDIS_TLS_CA_FILE_PATH: "{{ .Values.tlsCaFile }}" - REDIS_TLS_CERT_FILE_PATH: "{{ .Values.tlsCertFile }}" - REDIS_TLS_KEY_FILE_PATH: "{{ .Values.tlsKeyFile }}" + REDIS_TLS_CA_FILE_PATH: "{{ .Values.redis.tlsCaFile }}" + REDIS_TLS_CERT_FILE_PATH: "{{ .Values.redis.tlsCertFile }}" + REDIS_TLS_KEY_FILE_PATH: "{{ .Values.redis.tlsKeyFile }}" REDIS_URL: {{ include "backend.redisUrl" . | quote }} SIGNATURE_VERSION: "1" SLIPPAGE: "{{ .Values.ilp.slippage }}" From 655f987393a47e9e7cce645a8bdee15a59dbef7c Mon Sep 17 00:00:00 2001 From: golobitch Date: Thu, 2 May 2024 13:50:52 +0200 Subject: [PATCH 2/4] feat(auth): specify redis values --- charts/rafiki-auth/templates/_helpers.tpl | 3 +++ charts/rafiki-auth/templates/configmap.yaml | 3 +++ charts/rafiki-auth/templates/secret.yaml | 3 ++- charts/rafiki-auth/values.yaml | 6 ++++++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/charts/rafiki-auth/templates/_helpers.tpl b/charts/rafiki-auth/templates/_helpers.tpl index 730b28f..b77dd54 100644 --- a/charts/rafiki-auth/templates/_helpers.tpl +++ b/charts/rafiki-auth/templates/_helpers.tpl @@ -25,6 +25,9 @@ If release name contains chart name it will be used as a full name. {{- end -}} {{- end -}} +{{- define "auth.redisUrl" -}} +redis://{{ .Values.redis.host }}:{{ .Values.redis.port }} +{{- end -}} {{- define "auth.postgresqlUrl" -}} postgresql://{{ .Values.postgresql.username }}:{{ .Values.postgresql.password }}@{{ .Values.postgresql.host }}:{{ .Values.postgresql.port | int}}/{{ .Values.postgresql.database }} {{- end -}} diff --git a/charts/rafiki-auth/templates/configmap.yaml b/charts/rafiki-auth/templates/configmap.yaml index cffdba0..c0baf7b 100644 --- a/charts/rafiki-auth/templates/configmap.yaml +++ b/charts/rafiki-auth/templates/configmap.yaml @@ -20,3 +20,6 @@ data: PORT: "{{ .Values.port.auth }}" WAIT_SECONDS: "{{ .Values.grant.waitSeconds }}" ENABLE_MANUAL_MIGRATIONS: "{{ .Values.enableManualMigrations }}" + REDIS_TLS_CA_FILE_PATH: "{{ .Values.redis.tlsCaFile }}" + REDIS_TLS_CERT_FILE_PATH: "{{ .Values.redis.tlsCertFile }}" + REDIS_TLS_KEY_FILE_PATH: "{{ .Values.redis.tlsKeyFile }}" diff --git a/charts/rafiki-auth/templates/secret.yaml b/charts/rafiki-auth/templates/secret.yaml index 67c3594..648ef7e 100644 --- a/charts/rafiki-auth/templates/secret.yaml +++ b/charts/rafiki-auth/templates/secret.yaml @@ -7,4 +7,5 @@ metadata: data: AUTH_DATABASE_URL: {{ include "auth.postgresqlUrl" . | b64enc | quote }} COOKIE_KEY: "{{ .Values.cookieKey | b64enc }}" - IDENTITY_SERVER_SECRET: "{{ .Values.identityServer.secret | b64enc }}" \ No newline at end of file + IDENTITY_SERVER_SECRET: "{{ .Values.identityServer.secret | b64enc }}" + REDIS_URL: {{ include "auth.redisUrl" . | b64enc | quote }} \ No newline at end of file diff --git a/charts/rafiki-auth/values.yaml b/charts/rafiki-auth/values.yaml index 1989d68..4ea42ec 100644 --- a/charts/rafiki-auth/values.yaml +++ b/charts/rafiki-auth/values.yaml @@ -7,6 +7,12 @@ postgresql: username: "auth" database: "auth" password: "auth" +redis: + host: 'redis.example.com' + port: 6379 + tlsCaFile: 'tlsCaFile/path' + tlsCertFile: 'tlsCertFile/path' + tlsKeyFile: 'tlsKeyFile/path' port: admin: 3003 auth: 3006 From 161da7c340477463ff2567d7990c8f75e45da64b Mon Sep 17 00:00:00 2001 From: golobitch Date: Thu, 2 May 2024 13:53:21 +0200 Subject: [PATCH 3/4] bump(rafiki-auth): chart version to 0.4.3 --- charts/rafiki-auth/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rafiki-auth/Chart.yaml b/charts/rafiki-auth/Chart.yaml index 1c89eb7..1a3cae4 100644 --- a/charts/rafiki-auth/Chart.yaml +++ b/charts/rafiki-auth/Chart.yaml @@ -17,7 +17,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.4.2 +version: 0.4.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to From b77aea30f8c5d7d8bcd76e5a8c07626a30846585 Mon Sep 17 00:00:00 2001 From: golobitch Date: Thu, 2 May 2024 13:54:04 +0200 Subject: [PATCH 4/4] bump(rafiki-backend): chart version to 0.4.4 --- charts/rafiki-backend/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rafiki-backend/Chart.yaml b/charts/rafiki-backend/Chart.yaml index d70c57a..4a9e6ec 100644 --- a/charts/rafiki-backend/Chart.yaml +++ b/charts/rafiki-backend/Chart.yaml @@ -17,7 +17,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.4.3 +version: 0.4.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to