Skip to content

Commit 47f0d24

Browse files
author
Vadym Mudryi
committed
a lot if small changes
1 parent adf88df commit 47f0d24

File tree

17 files changed

+93
-17
lines changed

17 files changed

+93
-17
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dump.temporal.env

charts/dependencies/templates/elasticsearch.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ spec:
7070
value: /data/backups/elasticsearch
7171
- name: xpack.security.enabled
7272
value: 'false'
73+
{{- if or .Values.elasticsearch.secrets .Values.elasticsearch.env .Values.env }}
74+
{{- include "render-env-vars" (dict "service_name" "elasticsearch" "Values" .Values) }}
75+
{{- end }}
7376
image: docker.elastic.co/elasticsearch/elasticsearch:8.16.4
7477
name: elasticsearch
7578
resources:

charts/dependencies/templates/hearth.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ spec:
4444
value: mongodb://mongodb.opencrvs-deps-dev.svc.cluster.local/hearth-dev
4545
- name: server__fhirVersion
4646
value: stu3
47+
{{- if or .Values.hearth.secrets .Values.hearth.env .Values.env }}
48+
{{- include "render-env-vars" (dict "service_name" "hearth" "Values" .Values) }}
49+
{{- end }}
4750
image: opencrvs/hearth:1.1.0
4851
name: hearth
4952
ports:

charts/dependencies/templates/influxdb.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ spec:
7979
containers:
8080
- image: influxdb:1.8.10
8181
name: influxdb
82+
{{- if or .Values.influxdb.secrets .Values.influxdb.env .Values.env }}
83+
env:
84+
{{- include "render-env-vars" (dict "service_name" "influxdb" "Values" .Values) }}
85+
{{- end }}
8286
ports:
8387
- containerPort: 8086
8488
protocol: TCP

charts/dependencies/templates/minio.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,21 @@ spec:
1111
requests:
1212
storage: 1Gi
1313
---
14+
apiVersion: traefik.io/v1alpha1
15+
kind: IngressRoute
16+
metadata:
17+
name: minio-route
18+
spec:
19+
entryPoints:
20+
- websecure
21+
routes:
22+
- match: 'Host(`minio.{{ .Values.hostname }}`) || Host(`{{ .Values.hostname }}`)'
23+
kind: Rule
24+
services:
25+
- name: minio
26+
namespace: {{ .Release.Namespace }}
27+
port: 3536
28+
---
1429
apiVersion: v1
1530
kind: Service
1631
metadata:
@@ -56,6 +71,10 @@ spec:
5671
- /data
5772
image: quay.io/minio/minio:RELEASE.2023-09-16T01-01-47Z.fips
5873
name: minio
74+
{{- if or .Values.minio.secrets .Values.minio.env .Values.env }}
75+
env:
76+
{{- include "render-env-vars" (dict "service_name" "minio" "Values" .Values) }}
77+
{{- end }}
5978
ports:
6079
- containerPort: 3535
6180
protocol: TCP

charts/dependencies/templates/mongo.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ spec:
4545
spec:
4646
containers:
4747
- image: mongo:4.4
48+
{{- if or .Values.mongodb.secrets .Values.mongodb.env .Values.env }}
49+
env:
50+
{{- include "render-env-vars" (dict "service_name" "mongodb" "Values" .Values) }}
51+
{{- end }}
4852
name: mongodb
4953
ports:
5054
- containerPort: 27017

charts/dependencies/templates/redis.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ spec:
3131
containers:
3232
- image: redis:5
3333
name: redis
34+
{{- if or .Values.redis.secrets .Values.redis.env .Values.env }}
35+
env:
36+
{{- include "render-env-vars" (dict "service_name" "redis" "Values" .Values) }}
37+
{{- end }}
3438
ports:
3539
- containerPort: 6379
3640
protocol: TCP

charts/dependencies/values-dev.yaml

Whitespace-only changes.

charts/dependencies/values.yaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,15 @@
1-
mongo_version: 4.4
1+
2+
mongodb:
3+
version: 4.4
4+
5+
minio: {}
6+
7+
influxdb: {}
8+
9+
hearth: {}
10+
11+
redis: {}
12+
13+
elasticsearch: {}
14+
15+
hostname: farajaland.dev

charts/opencrvs-services/TODO.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,20 @@ Automatically issue SSL secret for traefix, check possibility to issue valid SSL
5959
6060
# Fixes
6161
62-
1. Fix events variables
62+
...
6363
6464
# Check
6565
6666
- https://kubernetes.io/docs/concepts/storage/volumes/#image
6767
68-
# Secrets
68+
# Add Pod Disruption Budget
6969
70-
There is a need to store secrets for Mongo, Elastic search, etc.
70+
If we would like to give people a way to deploy without downtime this option is mandatory
7171
72-
Easiest option is to store values as kubernetes secrets
73-
```
74-
kubectl create secret generic opencrvs-shared-secrets --from-env-file=.env.qa
75-
```
72+
# Liveness and readiness probes
7673
77-
And then pass as shared secret name
74+
Some services like login and client require extra attention at this point since nginx proxy does cache IP address of downstream service.
75+
76+
Some services just need proper configuration
77+
78+
# Add minio-mc container

0 commit comments

Comments
 (0)