feat(rafiki-auth): redis values (#39)

* fix(backend): path to redis tls values * feat(auth): specify redis values * bump(rafiki-auth): chart version to 0.4.3 * bump(rafiki-backend): chart version to 0.4.4
interledger · May 21, 2024 · 5c6a341 · 5c6a341
1 parent 0dac3f5
commit 5c6a341
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 6 deletions.
diff --git 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

diff --git 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
@@ -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
@@ -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 }}"
+  IDENTITY_SERVER_SECRET: "{{ .Values.identityServer.secret | b64enc }}"
+  REDIS_URL: {{ include "auth.redisUrl" . | b64enc | quote }}
diff --git 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

diff --git 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

diff --git 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 }}"