Removed hardcoded namespace

Vadym Mudryi · Vadym Mudryi · commit d9512a093dd2 · 2025-03-20T16:52:18.000+02:00
diff --git a/charts/opencrvs-services/TODO.md b/charts/opencrvs-services/TODO.md
@@ -1,5 +1,30 @@
 # Reduce number of hardcoded variables
 
+
+Follow up patterns:
+1. Links to services within same namespace should be explicitly listed:
+   Examples:
+   ```yaml
+   - name: APPLICATION_CONFIG_URL
+      value: http://config.{{ .Release.Namespace }}.svc.cluster.local:2021
+   ```
+2. Configuraton to Dependencies (middleware) should go as dedicated variables in helm chart:
+   Example: values.yaml
+   ```yaml
+   elasticsearch_host: elasticsearch.opencrvs-deps-dev.svc.cluster.local:9200
+
+   influxdb:
+      host: influxdb-0.influxdb.opencrvs-deps-dev.svc.cluster.local
+      port: 8086
+      db: ocrvs
+   ```
+   Take into account variables differ for each environment and for each setup. Google cloud have Mongo and Redis as a service.
+3. Inside manifests for particular services mentioning of middleware should be also explicit:
+   ```yaml
+   - name: ES_HOST
+     value: {{ .Values.elasticsearch_host | quote }}
+   ```
+
 CERT_PUBLIC_KEY_PATH is common for almost all services
 
 Few examples of common variables:
diff --git a/charts/opencrvs-services/templates/data-seeder.yaml b/charts/opencrvs-services/templates/data-seeder.yaml
@@ -17,6 +17,10 @@ spec:
         - name: data-seeder
           image: "ghcr.io/opencrvs/ocrvs-data-seeder:{{ .Values.image.tag }}"
           env:
+            - name: AUTH_HOST
+              value: "http://auth.{{ .Release.Namespace }}.svc.cluster.local:4040"
+            - name: GATEWAY_HOST
+              value: "http://gateway.{{ .Release.Namespace }}.svc.cluster.local:7070"
             {{- range $k, $v := .Values.env }}
             - name: {{ $k }}
               value: {{ $v | quote }}
diff --git a/charts/opencrvs-services/templates/events-deployment.yaml b/charts/opencrvs-services/templates/events-deployment.yaml
@@ -49,27 +49,22 @@ spec:
         - name: events
           image: "ghcr.io/opencrvs/ocrvs-events:{{ .Values.image.tag }}"
           env:
-            - name: MONGO_URL
-              value: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/events
             - name: AUTH_URL
               value: "http://auth.{{ .Release.Namespace }}.svc.cluster.local:4040"
             - name: COUNTRY_CONFIG_URL
               value: "http://countryconfig.{{ .Release.Namespace }}.svc.cluster.local:3040"
             - name: DOCUMENTS_URL
               value: "http://documents.{{ .Release.Namespace }}.svc.cluster.local:9050"
-            # TODO: Add password
             - name: ES_URL
-              value: "http://{{ .Values.elasticsearch_host }}"
+              value: "http://{{ .Values.elasticsearch_host }}"  # TODO: Add username and password
             - name: ES_INDEX_PREFIX
-              value: "foo"
-            # TODO: Add URL
-            - name: EVENTS_MONGO_URL
-              value: "mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/events"
+              value: "events"
             - name: USER_MANAGEMENT_URL
               value: "http://user-mgnt.{{ .Release.Namespace }}.svc.cluster.local:3030/"
-            # TODO: Add URL
-            - name: USER_MGNT_MONGO_URL
-              value: "mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/user-mgnt"
+          {{- range $k, $v := .Values.events.env }}
+            - name: {{ $k }}
+              value: {{ $v | quote }}
+          {{- end }}
           ports:
             - containerPort: 5555
               protocol: TCP
diff --git a/charts/opencrvs-services/templates/metrics-deployment.yaml b/charts/opencrvs-services/templates/metrics-deployment.yaml
@@ -50,12 +50,6 @@ 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: DASHBOARD_MONGO_URL
-              value: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/performance
-            - name: HEARTH_MONGO_URL
-              value: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/hearth-dev
-            - name: MONGO_URL
-              value: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/metrics
             - name: INFLUX_DB
               value: {{ .Values.influxdb.db | quote }}
             - name: INFLUX_HOST
@@ -66,7 +60,7 @@ spec:
             - name: {{ $k }}
               value: {{ $v | quote }}
           {{- end }}
-          {{- range $k, $v := .Values.gateway.env }}
+          {{- range $k, $v := .Values.metrics.env }}
             - name: {{ $k }}
               value: {{ $v | quote }}
           {{- end }}
diff --git a/charts/opencrvs-services/templates/migration-job.yaml b/charts/opencrvs-services/templates/migration-job.yaml
@@ -16,30 +16,24 @@ spec:
         - name: migration
           image: "ghcr.io/opencrvs/ocrvs-migration:{{ .Values.image.tag }}"
           env:
-            - name: APPLICATION_CONFIG_MONGO_URL
-              value: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/application-config
-            - name: PERFORMANCE_MONGO_URL
-              value: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/performance
             - name: ES_HOST
               value: {{ .Values.elasticsearch_host | quote }}
             - name: SEARCH_URL
-              value: http://search.{{ .Release.Namespace }}.svc.cluster.local:9090/ # FIXME: harcoded
-            - name: HEARTH_MONGO_URL
-              value: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/hearth-dev
+              value: http://search.{{ .Release.Namespace }}.svc.cluster.local:9090/
             - name: INFLUX_DB
               value: {{ .Values.influxdb.db | quote }}
             - name: INFLUX_HOST
               value: {{ .Values.influxdb.host | quote }}
             - name: INFLUX_PORT
               value: {{ .Values.influxdb.port | quote }}
             - name: MINIO_HOST
-              value: "minio-0.minio.opencrvs-deps-dev.svc.cluster.local"
-            - name: OPENHIM_MONGO_URL
-              value: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/openhim-dev
-            - name: USER_MGNT_MONGO_URL
-              value: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/user-mgnt
+              value: {{ .Values.minio_host | quote }}
             - name: WAIT_HOSTS
-              value: mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local:27017,influxdb.opencrvs-deps-dev.svc.cluster.local:8086,minio-0.minio.opencrvs-deps-dev.svc.cluster.local:3535,elasticsearch.opencrvs-deps-dev.svc.cluster.local:9200
+              value: "{{ .Values.mongodb_host }}:27017,{{ .Values.influxdb.host }}:{{ .Values.influxdb.port }},{{ .Values.minio_host }}:3535,{{ .Values.elasticsearch_host }}"
+          {{- range $k, $v := .Values.migration.env }}
+            - name: {{ $k }}
+              value: {{ $v | quote }}
+          {{- end }}
       completions: 1 # Run the job once
       backoffLimit: 0 # Don't retry if the job fails
       restartPolicy: "OnFailure"
diff --git a/charts/opencrvs-services/templates/notification-deployment.yaml b/charts/opencrvs-services/templates/notification-deployment.yaml
@@ -37,11 +37,9 @@ spec:
             - name: HOST
               value: 0.0.0.0
             - name: COUNTRY_CONFIG_URL
-              value: http://countryconfig.{{ .Release.Namespace }}.svc.cluster.local:3040 # FIXME: harcoded
-            - name: MONGO_URL
-              value: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/notification
+              value: http://countryconfig.{{ .Release.Namespace }}.svc.cluster.local:3040
             - name: USER_MANAGEMENT_URL
-              value: http://user-mgnt.{{ .Release.Namespace }}.svc.cluster.local:3030/ # FIXME: harcoded
+              value: http://user-mgnt.{{ .Release.Namespace }}.svc.cluster.local:3030/
           {{- 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://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/openhim-dev
+          {{- range $k, $v := .Values.scheduler.env }}
+            - name: {{ $k }}
+              value: {{ $v | quote }}
+          {{- end }}
       restartPolicy: Always
diff --git a/charts/opencrvs-services/templates/search-deployment.yaml b/charts/opencrvs-services/templates/search-deployment.yaml
@@ -35,17 +35,19 @@ spec:
             - name: FHIR_URL
               value: {{ .Values.fhir_url | quote }}
             - name: APPLICATION_CONFIG_URL
-              value: http://config.{{ .Release.Namespace }}.svc.cluster.local:2021 # FIXME: harcoded/
+              value: http://config.{{ .Release.Namespace }}.svc.cluster.local:2021
             - name: CERT_PUBLIC_KEY_PATH
               value: /secrets/public-key.pem
             - name: ES_HOST
               value: {{ .Values.elasticsearch_host | quote }}
-            - name: HEARTH_MONGO_URL
-              value: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/hearth-dev
             - name: NODE_ENV
               value: development
             - name: USER_MANAGEMENT_URL
-              value: http://user-mgnt.{{ .Release.Namespace }}.svc.cluster.local:3030/ # FIXME: hardcoded
+              value: http://user-mgnt.{{ .Release.Namespace }}.svc.cluster.local:3030/
+          {{- range $k, $v := .Values.search.env }}
+            - name: {{ $k }}
+              value: {{ $v | quote }}
+          {{- end }}
           ports:
             - containerPort: 9090
               protocol: TCP
diff --git a/charts/opencrvs-services/templates/user-mgnt-deployment.yaml b/charts/opencrvs-services/templates/user-mgnt-deployment.yaml
@@ -35,19 +35,21 @@ spec:
             - name: FHIR_URL
               value: {{ .Values.fhir_url | quote }}
             - name: APPLICATION_CONFIG_URL
-              value: http://config.{{ .Release.Namespace }}.svc.cluster.local:2021 # FIXME: harcoded/
+              value: http://config.{{ .Release.Namespace }}.svc.cluster.local:2021
             - name: CERT_PUBLIC_KEY_PATH
               value: /secrets/public-key.pem
             - name: HOST
               value: 0.0.0.0
             - name: METRICS_URL
-              value: http://metrics.{{ .Release.Namespace }}.svc.cluster.local:1050 # FIXME: harcoded
-            - name: MONGO_URL
-              value: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/user-mgnt
+              value: http://metrics.{{ .Release.Namespace }}.svc.cluster.local:1050
             - name: NOTIFICATION_SERVICE_URL
               value: http://notification.{{ .Release.Namespace }}.svc.cluster.local:2020/
             - name: DOCUMENTS_URL
               value: http://documents.{{ .Release.Namespace }}.svc.cluster.local:9050
+          {{- range $k, $v := .Values.userMgnt.env }}
+            - name: {{ $k }}
+              value: {{ $v | quote }}
+          {{- end }}
           ports:
             - containerPort: 3030
               protocol: TCP
diff --git a/charts/opencrvs-services/templates/webhooks-deployment.yaml b/charts/opencrvs-services/templates/webhooks-deployment.yaml
@@ -60,7 +60,7 @@ spec:
             - name: QA_ENV
               value: "false"
             - name: AUTH_URL
-              value: http://auth.{{ .Release.Namespace }}.svc.cluster.local:4040 # FIXME: harcoded
+              value: http://auth.{{ .Release.Namespace }}.svc.cluster.local:4040
             - name: CERT_PUBLIC_KEY_PATH
               value: /secrets/public-key.pem
             - name: CERT_PRIVATE_KEY_PATH
@@ -69,10 +69,12 @@ spec:
               value: "true"
             - name: HOST
               value: 0.0.0.0
-            - name: MONGO_URL
-              value: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/webhooks
             - name: USER_MANAGEMENT_URL
-              value: http://user-mgnt.{{ .Release.Namespace }}.svc.cluster.local:3030/ # FIXME: hardcoded
+              value: http://user-mgnt.{{ .Release.Namespace }}.svc.cluster.local:3030/
+          {{- range $k, $v := .Values.webhooks.env }}
+            - name: {{ $k }}
+              value: {{ $v | quote }}
+          {{- end }}
           ports:
             - containerPort: 2525
               protocol: TCP
diff --git a/charts/opencrvs-services/values.yaml b/charts/opencrvs-services/values.yaml
@@ -18,18 +18,24 @@ influxdb:
 # TODO: Add description
 fhir_url: http://hearth.opencrvs-deps-dev.svc.cluster.local:3447/fhir
 
+# Minio hostname
+minio_host: minio-0.minio.opencrvs-deps-dev.svc.cluster.local
+
+# MongoDB hostname
+mongodb_host: mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local
+
 # Defined at global level
 # SENTRY_DSN: https://...@o309867.ingest.sentry.io/....
 sentry_dsn: ""
 
 # Hostname for OpenCRVS (without wildcard or subdomain)
 # hostname: opencrvs.localhost
 
+
 env:
   QA_ENV: true
   # APN_SERVICE_URL: http://dependencies_apm-server:8200
 
-
 client:
   replicas: 1
 auth:
@@ -55,18 +61,15 @@ countryconfig:
     # "APN_SERVICE_URL=http://apm-server:8200",
 
     CHECK_INVALID_TOKEN: true
-    # TODO: Replace with https://register.{{ .Values.hostname }}
-    # CLIENT_APP_URL: https://register.opencrvs.localhost
     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
 
-    # GATEWAY_URL: "http://gateway.opencrvs-services-dev.svc.cluster.local:7070"
     # TODO: Replace with {{ .Values.hostname }}
     INFOBIP_API_KEY: ""
     INFOBIP_GATEWAY_ENDPOINT: ""
     INFOBIP_SENDER_ID: ""
-    # LOGIN_URL: "https://login.opencrvs.localhost"
+
     MONGO_URL: mongodb://mongodb-0.mongodb.opencrvs-deps-dev.svc.cluster.local/user-mgnt
     NODE_ENV: production
     NOTIFICATION_TRANSPORT: email
@@ -118,20 +121,44 @@ login:
 
 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
