Skip to content

Commit 1307a0e

Browse files
author
Vadym Mudryi
committed
Minor fixes and dashboards added
1 parent 32600af commit 1307a0e

File tree

5 files changed

+91
-5
lines changed

5 files changed

+91
-5
lines changed

README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ Additionally, explore all possible options for CSI (Container Storage Interface)
4545
## Prerequisites
4646

4747
Ensure you have one of the following solutions installed on your laptop:
48-
- Docker Desktop (with Kubernetes enabled): https://www.docker.com/products/docker-desktop/
48+
- [**Recommended**]: Docker Desktop (with Kubernetes enabled): https://www.docker.com/products/docker-desktop/. Please check following:
49+
- Enable host networking
50+
- Enable Kubernetes
4951
- MicroK8s: https://microk8s.io/
5052
- Minikube: https://minikube.sigs.k8s.io/docs/
5153

@@ -119,6 +121,12 @@ You need to fork the [opencrvs-countryconfig](https://github.com/opencrvs/opencr
119121
8. Navigate to [http://localhost:10350/](http://localhost:10350/)
120122
9. Once all container images are up and running your environment will be available at https://opencrvs.localhost
121123

124+
## Common issues
125+
126+
### Countryconfig is failing with ImagePullBackOff
127+
128+
Check image tag was set properly, use `kubectl`, adjust value in `kubernetes/opencrvs-services/values-dev.yaml`
129+
122130
---
123131

124132

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
labels:
5+
app: dashboards
6+
name: dashboards
7+
spec:
8+
ports:
9+
- port: 4444
10+
targetPort: 4444
11+
selector:
12+
app: config
13+
type: LoadBalancer
14+
---
15+
apiVersion: traefik.io/v1alpha1
16+
kind: IngressRoute
17+
metadata:
18+
name: dashboards-route
19+
spec:
20+
entryPoints:
21+
- websecure
22+
routes:
23+
- match: 'Host(`metabase.{{ .Values.hostname }}`)'
24+
kind: Rule
25+
services:
26+
- name: dashboards
27+
namespace: {{ .Release.Namespace }}
28+
port: 4444
29+
middlewares:
30+
- name: sts-and-basic-response-headers
31+
apiVersion: apps/v1
32+
kind: Deployment
33+
metadata:
34+
labels:
35+
app: dashboards
36+
name: dashboards
37+
spec:
38+
replicas: {{ .Values.dashboards.replicas }}
39+
selector:
40+
matchLabels:
41+
app: dashboards
42+
template:
43+
metadata:
44+
labels:
45+
app: dashboards
46+
spec:
47+
containers:
48+
- name: dashboards
49+
image: "ghcr.io/opencrvs/ocrvs-dashboards:{{ .Values.image.tag }}"
50+
env:
51+
- name: OPENCRVS_METABASE_SITE_URL
52+
value: "http://metabase.{{ .Values.hostname }}"
53+
- name: OPENCRVS_METABASE_MAP_URL
54+
value: "http://countryconfig.{{ .Release.Namespace }}.svc.cluster.local:3040/content/map.geojson"
55+
{{- range $k, $v := .Values.dashboards.env }}
56+
- name: {{ $k }}
57+
value: {{ $v | quote }}
58+
{{- end }}
59+
restartPolicy: Always

charts/opencrvs-services/templates/data-seeder.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ spec:
2121
value: "http://auth.{{ .Release.Namespace }}.svc.cluster.local:4040"
2222
- name: GATEWAY_HOST
2323
value: "http://gateway.{{ .Release.Namespace }}.svc.cluster.local:7070"
24+
- name: COUNTRY_CONFIG_HOST
25+
value: http://countryconfig.{{ .Release.Namespace }}.svc.cluster.local:3040
2426
{{- range $k, $v := .Values.env }}
2527
- name: {{ $k }}
2628
value: {{ $v | quote }}

charts/opencrvs-services/templates/documents-deployment.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ metadata:
1919
app: documents
2020
name: documents
2121
spec:
22-
replicas: {{ .Values.dashboards.replicas }}
22+
replicas: {{ .Values.documents.replicas }}
2323
selector:
2424
matchLabels:
2525
app: documents
@@ -43,6 +43,10 @@ spec:
4343
value: {{ .Values.minio.host | quote }}
4444
- name: MINIO_PORT
4545
value: {{ .Values.minio.port | quote }}
46+
{{- range $k, $v := .Values.documents.env }}
47+
- name: {{ $k }}
48+
value: {{ $v | quote }}
49+
{{- end }}
4650
image: "ghcr.io/opencrvs/ocrvs-documents:{{ .Values.image.tag }}"
4751
volumeMounts:
4852
- mountPath: /secrets/public-key.pem

charts/opencrvs-services/values.yaml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,23 @@ countryconfig:
8484
SMTP_USERNAME: apikey
8585
dashboards:
8686
replicas: 1
87+
env:
88+
OPENCRVS_METABASE_ADMIN_EMAIL: [email protected]
89+
OPENCRVS_METABASE_ADMIN_PASSWORD: idNMe7yiHIWtpL61ydsY
90+
OPENCRVS_METABASE_DB_AUTH_DB: ""
91+
OPENCRVS_METABASE_DB_HOST: mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local
92+
OPENCRVS_METABASE_DB_PASS: ""
93+
OPENCRVS_METABASE_DB_USER: ""
94+
OPENCRVS_METABASE_MAP_NAME: Full country
95+
OPENCRVS_METABASE_MAP_REGION_KEY: State
96+
OPENCRVS_METABASE_MAP_REGION_NAME: State
97+
OPENCRVS_METABASE_SITE_NAME: OpenCRVS Dashboards
98+
OPENCRVS_METABASE_ADMIN_EMAIL: [email protected]
99+
OPENCRVS_METABASE_ADMIN_PASSWORD: m3tabase
100+
87101
data_seeder:
88102
enabled: false
89103
env:
90-
# TODO: Fix variable name
91-
COUNTRY_CONFIG_HOST: "http://countryconfig.opencrvs-services-dev.svc.cluster.local:3040"
92104
SUPER_USER_PASSWORD: "password"
93105
ACTIVATE_USERS: "true"
94106
documents:
@@ -162,5 +174,6 @@ migration:
162174
PERFORMANCE_MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/performance
163175
HEARTH_MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/hearth-dev
164176
OPENHIM_MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/openhim-dev
177+
165178
hostname: farajaland.com
166-
dev_mode: false
179+
dev_mode: false

0 commit comments

Comments
 (0)