refactored hardcoded mongodb

Vadym Mudryi · Vadym Mudryi · commit 581eac642157 · 2025-03-21T16:03:08.000+02:00
diff --git a/charts/opencrvs-services/templates/config-deployment.yaml b/charts/opencrvs-services/templates/config-deployment.yaml
@@ -71,6 +71,10 @@ spec:
               value: http://search.{{ .Release.Namespace }}.svc.cluster.local:9090/    
             - name: USER_MANAGEMENT_URL
               value: http://user-mgnt.{{ .Release.Namespace }}.svc.cluster.local:3030/
+            - name: HEARTH_MONGO_URL
+              value: "mongodb://{{ .Values.mongodb.mongodb_host }}/hearth-dev"
+            - name: MONGO_URL
+              value: mongodb://{{ .Values.mongodb.mongodb_host }}/application-config
           {{- range $k, $v := .Values.env }}
             - name: {{ $k }}
               value: {{ $v | quote }}
diff --git a/charts/opencrvs-services/templates/countryconfig-deployment.yaml b/charts/opencrvs-services/templates/countryconfig-deployment.yaml
@@ -76,6 +76,10 @@ spec:
         - name: countryconfig
           image: "{{ .Values.countryconfig.image.name }}:{{ .Values.countryconfig.image.tag }}"
           env:
+            - name: CERT_PUBLIC_KEY_PATH
+              value: /secrets/public-key.pem
+            - name: COUNTRY_CONFIG_HOST
+              value: "0.0.0.0"
             - name: FHIR_URL
               value: {{ .Values.fhir_url | quote }}
             - name: CLIENT_APP_URL
@@ -95,6 +99,10 @@ spec:
               value: "http://auth.{{ .Release.Namespace }}.svc.cluster.local:4040"
             - name: CONFIRM_REGISTRATION_URL
               value: http://workflow.{{ .Release.Namespace }}.svc.cluster.local:5050/confirm/registration
+            - name: CONFIG_MONGO_URL
+              value: mongodb://{{ .Values.mongodb.mongodb_host }}/application-config
+            - name: MONGO_URL
+              value: mongodb://{{ .Values.mongodb.mongodb_host }}/user-mgnt
           {{- range $k, $v := .Values.env }}
             - name: {{ $k }}
               value: {{ $v | quote }}
diff --git a/charts/opencrvs-services/templates/dashboards-deployment.yaml b/charts/opencrvs-services/templates/dashboards-deployment.yaml
@@ -52,6 +52,8 @@ spec:
               value: "http://metabase.{{ .Values.hostname }}"
             - name: OPENCRVS_METABASE_MAP_URL
               value: "http://countryconfig.{{ .Release.Namespace }}.svc.cluster.local:3040/content/map.geojson"
+            - name: OPENCRVS_METABASE_DB_HOST
+              value: {{ .Values.mongodb.mongodb_host | quote }}
           {{- range $k, $v := .Values.dashboards.env }}
             - name: {{ $k }}
               value: {{ $v | quote }}
diff --git a/charts/opencrvs-services/templates/events-deployment.yaml b/charts/opencrvs-services/templates/events-deployment.yaml
@@ -61,6 +61,12 @@ spec:
               value: "events"
             - name: USER_MANAGEMENT_URL
               value: "http://user-mgnt.{{ .Release.Namespace }}.svc.cluster.local:3030/"
+            - name: USER_MGNT_MONGO_URL
+              value: mongodb://{{ .Values.mongodb.mongodb_host }}/user-mgnt
+            - name: EVENTS_MONGO_URL
+              value: mongodb://{{ .Values.mongodb.mongodb_host }}/events
+            - name: MONGO_URL
+              value: mongodb://{{ .Values.mongodb.mongodb_host }}/events
           {{- range $k, $v := .Values.events.env }}
             - name: {{ $k }}
               value: {{ $v | quote }}
diff --git a/charts/opencrvs-services/templates/gateway-deployment.yaml b/charts/opencrvs-services/templates/gateway-deployment.yaml
@@ -50,6 +50,10 @@ spec:
         - name: gateway
           image: "ghcr.io/opencrvs/ocrvs-gateway:{{ .Values.image.tag }}"
           env:
+            - name: CERT_PUBLIC_KEY_PATH
+              value: /secrets/public-key.pem
+            - name: HOST
+              value: "0.0.0.0"
             - name: FHIR_URL
               value: {{ .Values.fhir_url | quote }}
             - name: REDIS_HOST
diff --git a/charts/opencrvs-services/templates/metrics-deployment.yaml b/charts/opencrvs-services/templates/metrics-deployment.yaml
@@ -56,6 +56,12 @@ spec:
               value: {{ .Values.influxdb.host | quote }}
             - name: INFLUX_PORT
               value: {{ .Values.influxdb.port | quote }}
+            - name: DASHBOARD_MONGO_URL
+              value: mongodb://{{ .Values.mongodb.mongodb_host }}/performance
+            - name: HEARTH_MONGO_URL
+              value: mongodb://{{ .Values.mongodb.mongodb_host }}/hearth-dev
+            - name: MONGO_URL
+              value: mongodb://{{ .Values.mongodb.mongodb_host }}/metrics
           {{- range $k, $v := .Values.env }}
             - name: {{ $k }}
               value: {{ $v | quote }}
diff --git a/charts/opencrvs-services/templates/migration-job.yaml b/charts/opencrvs-services/templates/migration-job.yaml
@@ -28,6 +28,16 @@ spec:
               value: {{ .Values.influxdb.port | quote }}
             - name: MINIO_HOST
               value: {{ .Values.minio.host | quote }}
+            - name: APPLICATION_CONFIG_MONGO_URL
+              value: mongodb://{{ .Values.mongodb.mongodb_host }}/application-config
+            - name: USER_MGNT_MONGO_URL
+              value: mongodb://{{ .Values.mongodb.mongodb_host }}/user-mgnt
+            - name: PERFORMANCE_MONGO_URL
+              value: mongodb://{{ .Values.mongodb.mongodb_host }}/performance
+            - name: HEARTH_MONGO_URL
+              value: mongodb://{{ .Values.mongodb.mongodb_host }}/hearth-dev
+            - name: OPENHIM_MONGO_URL
+              value: mongodb://{{ .Values.mongodb.mongodb_host }}/openhim-dev
             - name: WAIT_HOSTS
               value: "{{ .Values.mongodb_host }}:27017,{{ .Values.influxdb.host }}:{{ .Values.influxdb.port }},{{ .Values.minio.host }}:{{ .Values.minio.port }},{{ .Values.elasticsearch_host }}"
           {{- range $k, $v := .Values.migration.env }}
diff --git a/charts/opencrvs-services/templates/notification-deployment.yaml b/charts/opencrvs-services/templates/notification-deployment.yaml
@@ -40,6 +40,8 @@ spec:
               value: http://countryconfig.{{ .Release.Namespace }}.svc.cluster.local:3040
             - name: USER_MANAGEMENT_URL
               value: http://user-mgnt.{{ .Release.Namespace }}.svc.cluster.local:3030/
+            - name: MONGO_URL
+              value: mongodb://{{ .Values.mongodb.mongodb_host }}/notification
           {{- range $k, $v := .Values.env }}
             - name: {{ $k }}
               value: {{ $v | quote }}
diff --git a/charts/opencrvs-services/templates/scheduler-deployment.yaml b/charts/opencrvs-services/templates/scheduler-deployment.yaml
@@ -23,6 +23,8 @@ spec:
               value: http://metrics.{{ .Release.Namespace }}.svc.cluster.local:1050 # FIXME: harcoded
             - name: NODE_ENV
               value: development
+            - name: OPENHIM_MONGO_URL
+              value: mongodb://{{ .Values.mongodb.mongodb_host }}/openhim-dev
           {{- range $k, $v := .Values.scheduler.env }}
             - name: {{ $k }}
               value: {{ $v | quote }}
diff --git a/charts/opencrvs-services/templates/search-deployment.yaml b/charts/opencrvs-services/templates/search-deployment.yaml
@@ -44,6 +44,8 @@ spec:
               value: development
             - name: USER_MANAGEMENT_URL
               value: http://user-mgnt.{{ .Release.Namespace }}.svc.cluster.local:3030/
+            - name: HEARTH_MONGO_URL
+              value: mongodb://{{ .Values.mongodb.mongodb_host }}/hearth-dev
           {{- range $k, $v := .Values.search.env }}
             - name: {{ $k }}
               value: {{ $v | quote }}
diff --git a/charts/opencrvs-services/templates/user-mgnt-deployment.yaml b/charts/opencrvs-services/templates/user-mgnt-deployment.yaml
@@ -46,6 +46,8 @@ spec:
               value: http://notification.{{ .Release.Namespace }}.svc.cluster.local:2020/
             - name: DOCUMENTS_URL
               value: http://documents.{{ .Release.Namespace }}.svc.cluster.local:9050
+            - name: MONGO_URL
+              value: mongodb://{{ .Values.mongodb.mongodb_host }}/user-mgnt
           {{- range $k, $v := .Values.userMgnt.env }}
             - name: {{ $k }}
               value: {{ $v | quote }}
diff --git a/charts/opencrvs-services/templates/webhooks-deployment.yaml b/charts/opencrvs-services/templates/webhooks-deployment.yaml
@@ -71,6 +71,8 @@ spec:
               value: 0.0.0.0
             - name: USER_MANAGEMENT_URL
               value: http://user-mgnt.{{ .Release.Namespace }}.svc.cluster.local:3030/
+            - name: MONGO_URL
+              value: mongodb://{{ .Values.mongodb.mongodb_host }}/webhooks
           {{- range $k, $v := .Values.webhooks.env }}
             - name: {{ $k }}
               value: {{ $v | quote }}
diff --git a/charts/opencrvs-services/values.yaml b/charts/opencrvs-services/values.yaml
@@ -50,8 +50,6 @@ config:
     LOG_LEVEL: "debug"
     DOMAIN: "*"
     CHECK_INVALID_TOKEN: true
-    HEARTH_MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/hearth-dev
-    MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/application-config
     NODE_ENV: production
 countryconfig:
   image:
@@ -60,22 +58,14 @@ countryconfig:
   replicas: 1
   env:
     ALERT_EMAIL: kibana-alerts-aaaafy3oysoklmlsqcjxad7rfi@opencrvsworkspace.slack.com
-    # "APN_SERVICE_URL=http://apm-server:8200",
-
     CHECK_INVALID_TOKEN: true
-    COUNTRY_CONFIG_HOST: "0.0.0.0"
-    CERT_PUBLIC_KEY_PATH: /secrets/public-key.pem
-    CONFIG_MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/application-config
-
-    # TODO: Replace with {{ .Values.hostname }}
     INFOBIP_API_KEY: ""
     INFOBIP_GATEWAY_ENDPOINT: ""
     INFOBIP_SENDER_ID: ""
 
-    MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/user-mgnt
     NODE_ENV: production
     NOTIFICATION_TRANSPORT: email
-    QA_ENV: true
+
     SENDER_EMAIL_ADDRESS: noreply@opencrvs.org
     SMTP_HOST: localhost
     SMTP_PASSWORD: ""
@@ -85,10 +75,9 @@ countryconfig:
 dashboards:
   replicas: 1
   env:
-    OPENCRVS_METABASE_ADMIN_EMAIL: metabase-admin@opencrvs.org
-    OPENCRVS_METABASE_ADMIN_PASSWORD: idNMe7yiHIWtpL61ydsY
+    OPENCRVS_METABASE_ADMIN_EMAIL: ""
+    OPENCRVS_METABASE_ADMIN_PASSWORD: ""
     OPENCRVS_METABASE_DB_AUTH_DB: ""
-    OPENCRVS_METABASE_DB_HOST: mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local
     OPENCRVS_METABASE_DB_PASS: ""
     OPENCRVS_METABASE_DB_USER: ""
     OPENCRVS_METABASE_MAP_NAME: Full country
@@ -108,72 +97,45 @@ documents:
 gateway:
   replicas: 1
   env:
-    CERT_PUBLIC_KEY_PATH: "/secrets/public-key.pem"
     CHECK_INVALID_TOKEN: "true"
     CONFIG_SMS_CODE_EXPIRY_SECONDS: "600"
     CONFIG_TOKEN_EXPIRY_SECONDS: "604800"
 
     MINIO_BUCKET: "ocrvs"
-    # # TODO: Check usage
-    # NODE_ENV: "development"
-    # LOGIN_URL: "https://login.opencrvs.localhost"
+
     NODE_ENV: production
 
     COUNTRY: FAR
     DISABLE_RATE_LIMIT: "true"
     # # TODO: Check usage
     DOMAIN: "opencrvs.localhost"
 
-    HOST: "0.0.0.0"
     LANGUAGES: "en,fr"
 
-    QA_ENV: "true"
-    # "APN_SERVICE_URL=http://dependencies_apm-server:8200",
-
 login:
   replicas: 1
 
 metrics:
   replicas: 1
-  env:
-    DASHBOARD_MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/performance
-    HEARTH_MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/hearth-dev
-    MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/metrics
+
 notification:
   env:
     COUNTRY: bgd
-    MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/notification
   replicas: 1
 search:
   replicas: 1
-  env:
-    HEARTH_MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/hearth-dev
+
 userMgnt:
   replicas: 1
-  env:
-    MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/user-mgnt
+
 webhooks:
   replicas: 1
-  env:
-    MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/webhooks
+
 workflow:
   replicas: 1
-scheduler:
-  env:
-    OPENHIM_MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/openhim-dev
+
 events:
   replicas: 1
-  env:
-    USER_MGNT_MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/user-mgnt
-    EVENTS_MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/events
-    MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/events
-migration:
-  env:
-    APPLICATION_CONFIG_MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/application-config
-    USER_MGNT_MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/user-mgnt
-    PERFORMANCE_MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/performance
-    HEARTH_MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/hearth-dev
-    OPENHIM_MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/openhim-dev
 
 hostname: farajaland.com
 dev_mode: false
