Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7749d3f
feat: added redis configuration
NatalieShaked Aug 27, 2024
5bb7d11
test: added redis to tests
NatalieShaked Aug 27, 2024
3536e6e
fix: fixed redis configuration
NatalieShaked Aug 29, 2024
a560876
feat: api responses get sent to redis
NatalieShaked Aug 29, 2024
1f97c76
feat: added ttl of 5 mins to redis set
NatalieShaked Aug 29, 2024
b5a4031
fix: removed unnecessary redis configs
NatalieShaked Sep 1, 2024
e0c9f30
fix: eslint fixes
NatalieShaked Sep 1, 2024
9f21b64
feat: added request id to response header
NatalieShaked Sep 9, 2024
03d24d2
feat: sent x-api-key header to redis
NatalieShaked Sep 9, 2024
c02c9b7
feat: sent the current site to redis, will adjust the s3 entrypoint o…
NatalieShaked Sep 9, 2024
1f7bf3a
Merge branch '0.1.0' of https://github.com/MapColonies/geocoding into…
NatalieShaked Sep 12, 2024
5406ea1
feat: added redis health check
NatalieShaked Sep 12, 2024
3541c48
delete: removed redis healthcheck
NatalieShaked Sep 12, 2024
ebc5efe
fix: added missing redis config
NatalieShaked Sep 12, 2024
5b607a6
fix: added missing imports; removed pg
NatalieShaked Sep 12, 2024
5e6ff68
fix: added missing closing bracket
NatalieShaked Sep 12, 2024
259a029
fix: added missing closing bracket
NatalieShaked Sep 12, 2024
5084e3b
fix: application placement
NatalieShaked Sep 12, 2024
5955e13
fix: made minor fixes to the code in order for it to be more tidy
NatalieShaked Sep 15, 2024
59fcd5a
Merge branch '0.1.0' of https://github.com/MapColonies/geocoding into…
NatalieShaked Sep 15, 2024
e2ca1b1
fix: feedback sends to redis without adding time to the response
NatalieShaked Sep 23, 2024
4ad4d0c
Merge branch '0.1.0' of https://github.com/MapColonies/geocoding into…
NatalieShaked Sep 23, 2024
e5dd67f
fix: minor fixes for code clearness
NatalieShaked Sep 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions config/custom-environment-variables.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,28 @@
"__name": "S3_FILES_DATA",
"__format": "json"
}
},
"redis": {
"host": "REDIS_HOST",
"port": {
"__name": "REDIS_PORT",
"__format": "number"
},
"username": "REDIS_USERNAME",
"password": "REDIS_PASSWORD",
"enableSslAuth": {
"__name": "REDIS_ENABLE_SSL_AUTH",
"__format": "boolean"
},
"sslPaths": {
"ca": "REDIS_CA_PATH",
"key": "REDIS_KEY_PATH",
"cert": "REDIS_CERT_PATH"
},
"database": {
"__name": "REDIS_DATABASE",
"__format": "number"
}
}
},
"application": {
Expand Down
13 changes: 13 additions & 0 deletions config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,19 @@
"fileName": "table.json"
}
}
},
"redis": {
"host": "REDIS_HOST",
"port": 6379,
"username": "",
"password": "",
"enableSslAuth": false,
"sslPaths": {
"ca": "",
"key": "",
"cert": ""
},
"database": 0
}
},
"application": {
Expand Down
13 changes: 13 additions & 0 deletions config/test.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,19 @@
"fileName": "table.json"
}
}
},
"redis": {
"host": "localhost",
"port": 6379,
"username": "",
"password": "",
"enableSslAuth": false,
"sslPaths": {
"ca": "",
"key": "",
"cert": ""
},
"database": 1
}
},
"application": {
Expand Down
13 changes: 0 additions & 13 deletions dataSource.ts

This file was deleted.

13 changes: 13 additions & 0 deletions helm/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,18 @@ data:
TELEMETRY_METRICS_ENABLED: 'true'
TELEMETRY_METRICS_URL: {{ $metricsUrl }}
{{ end }}
{{- with .Values.redisConfig }}
REDIS_HOST: {{ .host }}
REDIS_DATABASE: {{ .database | quote}}
REDIS_PORT: {{ .port | quote }}
{{- if .sslAuth.enabled }}
REDIS_ENABLE_SSL_AUTH: "true"
REDIS_CERT_PATH: /tmp/certs/{{ .sslAuth.certFileName }}
REDIS_KEY_PATH: /tmp/certs/{{ .sslAuth.keyFileName }}
REDIS_CA_PATH: /tmp/certs/{{ .sslAuth.caFileName }}
{{- else }}
REDIS_ENABLE_SSL_AUTH: "false"
{{- end }}
{{- end }}
npm_config_cache: /tmp/
{{- end }}
10 changes: 10 additions & 0 deletions helm/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ spec:
name: root-ca
subPath: {{ quote .Values.caKey }}
{{- end }}
{{- if .Values.redisConfig.sslAuth.enabled }}
- name: cert-conf
mountPath: /tmp/certs
readOnly: true
{{- end }}
{{- if .Values.extraVolumeMounts -}}
{{ toYaml .Values.extraVolumeMounts | nindent 12 }}
{{- end }}
Expand Down Expand Up @@ -109,6 +114,11 @@ spec:
secret:
secretName: {{ .Values.caSecretName }}
{{- end }}
{{- if .Values.redisConfig.sslAuth.enabled }}
- name: cert-conf
secret:
secretName: {{ .Values.redisConfig.sslAuth.secretName }}
{{- end }}
{{- if .Values.extraVolumes -}}
{{ tpl (toYaml .Values.extraVolumes) . | nindent 8 }}
{{- end }}
Expand Down
13 changes: 13 additions & 0 deletions helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,19 @@ env:
enabled: false
url: http://localhost:55681/v1/metrics

redisConfig:
host: localhost
username: ""
password: ""
database: 0
port: 6379
sslAuth:
enabled: false
secretName: secret-name
certFileName: postgresql.crt
keyFileName: postgresql.key
caFileName: root.crt

resources:
enabled: true
value:
Expand Down
Loading