config update

AAFC-BICoE · Feb 23, 2024 · 9bdba5e · 9bdba5e
1 parent 4b17ae7
commit 9bdba5e
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 34 deletions.
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.6.0
+version: 1.8
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.6.0"
+appVersion: "1.8"
diff --git a/helm/templates/configMaps/configMaps.yaml b/helm/templates/configMaps/configMaps.yaml
@@ -47,35 +47,51 @@ kind: ConfigMap
 metadata:
   name: message-producer-override-objectstore
 data:
-  MESSAGING_ISPRODUCER: {{ .Values.services.objectstoreapi.environment.messaging.isProducer | quote }}
+  DINA_MESSAGING_ISPRODUCER: {{ .Values.services.objectstoreapi.environment.dina.messaging.isProducer | quote }}
   RABBITMQ_HOST: {{ tpl .Values.services.objectstoreapi.environment.rabbitmq.host . }}
-  RABBITMQ_QUEUE: {{ .Values.services.objectstoreapi.environment.rabbitmq.queue }}
-  RABBITMQ_EXCHANGE: {{ .Values.services.objectstoreapi.environment.rabbitmq.exchange }}
-  RABBITMQ_ROUTINGKEY: {{ .Values.services.objectstoreapi.environment.rabbitmq.routingkey }}
-  RABBITMQ_USERNAME: {{ .Values.services.objectstoreapi.environment.rabbitmq.username }}
-  RABBITMQ_PASSWORD: {{ .Values.services.objectstoreapi.environment.rabbitmq.password }}
+  RABBITMQ_QUEUE: {{ tpl .Values.services.objectstoreapi.environment.rabbitmq.queue . }}
+  RABBITMQ_USERNAME: {{ tpl .Values.services.objectstoreapi.environment.rabbitmq.username . }}
+  RABBITMQ_PASSWORD: {{ tpl .Values.services.objectstoreapi.environment.rabbitmq.password . }}
   RABBITMQ_PORT: {{ .Values.services.objectstoreapi.environment.rabbitmq.port | quote }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: message-producer-override-collection
 data:
-  MESSAGING_ISPRODUCER: {{ .Values.services.collectionapi.environment.messaging.isProducer | quote }}
+  DINA_MESSAGING_ISPRODUCER: {{ .Values.services.collectionapi.environment.dina.messaging.isProducer | quote }}
   RABBITMQ_HOST: {{ tpl .Values.services.collectionapi.environment.rabbitmq.host . }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: message-producer-override-loantransaction
 data:
-  MESSAGING_ISPRODUCER: {{ .Values.services.loantransactionapi.environment.messaging.isProducer | quote }}
+  DINA_MESSAGING_ISPRODUCER: {{ .Values.services.loantransactionapi.environment.dina.messaging.isProducer | quote }}
   RABBITMQ_HOST: {{ tpl .Values.services.loantransactionapi.environment.rabbitmq.host . }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: message-producer-override-agentapi
 data:
-  MESSAGING_ISPRODUCER: {{ .Values.services.agentapi.environment.messaging.isProducer | quote }}
-  RABBITMQ_HOST: {{ tpl .Values.services.agentapi.environment.rabbitmq.host . }}
+  DINA_MESSAGING_ISPRODUCER: {{ .Values.services.agentapi.environment.dina.messaging.isProducer | quote }}
+  RABBITMQ_HOST: {{ tpl .Values.services.agentapi.environment.rabbitmq.host . }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: message-producer-override-exportapi
+data:
+  DINA_MESSAGING_ISCONSUMER: {{ .Values.services.dinaexportapi.environment.dina.messaging.isProducer | quote }}
+  DINA_MESSAGING_EXPORT_QUEUE: {{ tpl .Values.services.dinaexportapi.environment.dina.messaging.export.queue . }}
+  DINA_EXPORT_OBJECT_STORE_DOWNLOAD_URL: {{ tpl .Values.services.dinaexportapi.environment.dina.export.objectStoreDownloadUrl . }}
+  RABBITMQ_HOST: {{ tpl .Values.services.dinaexportapi.environment.rabbitmq.host . }}
+  RABBITMQ_USERNAME: {{ tpl .Values.services.dinaexportapi.environment.rabbitmq.username . }}
+  RABBITMQ_PASSWORD: {{ tpl .Values.services.dinaexportapi.environment.rabbitmq.password . }}
+  HTTP-CLIENT_OPENID-CONNECT-BASE-URL: {{ tpl .Values.services.dinaexportapi.environment.http_client.openid_connect_base_url . }}
+  HTTP-CLIENT_CLIENT-ID: {{ tpl .Values.services.dinaexportapi.environment.http_client.client_id . }}
+  HTTP-CLIENT_USERNAME: {{ tpl .Values.services.dinaexportapi.environment.http_client.username . }}
+  HTTP-CLIENT_PASSWORD: {{ tpl .Values.services.dinaexportapi.environment.http_client.password . }}
+
+---
diff --git a/helm/templates/deployments/dina-export-api.yaml b/helm/templates/deployments/dina-export-api.yaml
@@ -87,6 +87,11 @@ spec:
       containers:
         - name: dina-export-api
           image: {{ .Values.services.dinaexportapi.image }}
+          {{- if .Values.messageProducerOverride.enabled }}
+          envFrom:
+            - configMapRef:
+                name: message-producer-override-exportapi
+          {{- end }}
           env:
             - name: KEYCLOAK_ENABLED
               value: {{ .Values.global.environment.keycloak.enabled | quote }}

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -44,6 +44,9 @@ global:
         datasource_user: web_user_ex
         liquibase_user: migration_user_ex
         liquibase_password:
+        http_client:
+          username: cnc-su
+          password: cnc-su
       minio:
         service: minio-service
         accessKey: minio
@@ -110,6 +113,12 @@ global:
       rabbitmq:
         label: rabbitmq-dina
         service: rabbitmq-dina-service
+        username: guest
+        password: guest
+        search:
+          queue: dina.search.queue
+        export:
+          queue: dina.export.queue
     keycloak:
       client_id: dina-public
       realm: dina
@@ -202,24 +211,26 @@ services:
             password: "{{ .Values.global.environment.config.seqdb_api.liquibase_password }}"
         PG_EXTENSION_seqdb: pgcrypto
   agentapi:
-    image: aafcbicoe/agent-api:0.25
+    image: aafcbicoe/agent-api:0.26
     pullPolicy: IfNotPresent
     environment:
       rabbitmq:
         host: "{{ .Values.global.environment.config.rabbitmq.service }}"
-      messaging:
-        isProducer: true
+      dina:
+        messaging:
+          isProducer: true
       spring:
         datasource:
           url: jdbc:postgresql://{{ .Values.global.environment.config.dina_db.service }}/agent?currentSchema=agent
   collectionapi:
-    image: aafcbicoe/natural-history-collection-api:0.82
+    image: aafcbicoe/natural-history-collection-api:0.83
     pullPolicy: IfNotPresent
     environment:
       rabbitmq:
         host: "{{ .Values.global.environment.config.rabbitmq.service }}"
-      messaging:
-        isProducer: true
+      dina:
+        messaging:
+          isProducer: true
       spring:
         datasource:
           url: jdbc:postgresql://{{ .Values.global.environment.config.dina_db.service }}/collection?currentSchema=collection
@@ -233,7 +244,7 @@ services:
         cpu: 80m
         memory: 768Mi
   dinaexportapi:
-    image: aafcbicoe/dina-export-api:0.5
+    image: aafcbicoe/dina-export-api:0.6.1
     pullPolicy: IfNotPresent
     environment:
       spring:
@@ -242,13 +253,27 @@ services:
         freemarker:
           template_loader_path: classpath:/templates/,file:/tmp/dina-data-export/templates/
       dina:
+        messaging:
+          isConsumer: true
+          export:
+            queue: "{{ .Values.global.environment.config.rabbitmq.export.queue }}"
         export:
+          objectStoreDownloadUrl: http://{{ .Values.global.environment.config.objectstore_api.service }}:8080/api/v1/toa
           workingFolder: /tmp/dina-data-export
+      http_client:
+        openid_connect_base_url: "{{ tpl .Values.global.environment.keycloak.auth_server_url . }}/realms/dina/protocol/openid-connect/"
+        client_id: "{{ .Values.global.environment.keycloak.client_id }}"
+        username: "{{ .Values.global.environment.config.dina_export_api.http_client.username }}"
+        password: "{{ .Values.global.environment.config.dina_export_api.http_client.password }}"
+      rabbitmq:
+        host: "{{ .Values.global.environment.config.rabbitmq.service }}"
+        username: "{{ .Values.global.environment.config.rabbitmq.username }}"
+        password: "{{ .Values.global.environment.config.rabbitmq.password }}"
       elasticsearch:
         host: "{{ .Values.global.environment.config.elasticsearch.service }}"
         port: 9200
   dinaui:
-    image: aafcbicoe/dina-ui:0.142.0
+    image: aafcbicoe/dina-ui:0.146.1
     environment:
       KEYCLOAK_CLIENTID: "{{ .Values.global.environment.keycloak.client_id }}"
       KEYCLOAK_REALM: "{{ .Values.global.environment.keycloak.realm }}"
@@ -269,28 +294,28 @@ services:
         datasource:
           url: jdbc:postgresql://{{ .Values.global.environment.config.dina_db.service }}/dina_user?currentSchema=dina_user
   loantransactionapi:
-    image: aafcbicoe/loan-transaction-api:0.8
+    image: aafcbicoe/loan-transaction-api:0.9
     environment:
       rabbitmq:
         host: "{{ .Values.global.environment.config.rabbitmq.service }}"
-      messaging:
-        isProducer: true
+      dina:
+        messaging:
+          isProducer: true
       spring:
         datasource:
           url: jdbc:postgresql://{{ .Values.global.environment.config.dina_db.service }}/loan_transaction?currentSchema=loan_transaction
   objectstoreapi:
-    image: aafcbicoe/object-store-api:1.10
+    image: aafcbicoe/object-store-api:1.12
     environment:
       rabbitmq:
         host: "{{ .Values.global.environment.config.rabbitmq.service }}"
-        queue: dina.search.queue
-        exchange: dina.search.exchange
-        routingkey: dina.search.routingkey
-        username: guest
-        password: guest
+        queue: "{{ .Values.global.environment.config.rabbitmq.search.queue }}"
+        username: "{{ .Values.global.environment.config.rabbitmq.username }}"
+        password: "{{ .Values.global.environment.config.rabbitmq.password }}"
         port: 15672
-      messaging:
-        isProducer: true
+      dina:
+        messaging:
+          isProducer: true
       spring:
         datasource:
           url: jdbc:postgresql://{{ .Values.global.environment.config.dina_db.service }}/object_store?currentSchema=object_store
@@ -322,7 +347,6 @@ services:
       KC_PROXY: edge
   elasticsearchdina:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.17.10
-    #image: elasticsearch_icu:7.17.10
     environment:
       xpack:
         security:
@@ -364,7 +388,7 @@ services:
       DB_PASSWORD: "{{ .Values.global.environment.config.keycloak.db_password }}"
       USE_V2: "true"
   searchcli:
-    image: aafcbicoe/dina-search-cli:0.27
+    image: aafcbicoe/dina-search-cli:0.29
     environment:
       keycloak:
         openid_auth_server: "{{ tpl .Values.global.environment.keycloak.auth_server_url . }}/realms/dina/protocol/openid-connect/token"
@@ -382,7 +406,7 @@ services:
       IS_MESSAGE_CONSUMER: true
       IS_MESSAGE_PRODUCER: true
   searchws:
-    image: aafcbicoe/dina-search-ws:0.27
+    image: aafcbicoe/dina-search-ws:0.29
     environment:
       elasticsearch:
         host: "{{ .Values.global.environment.config.elasticsearch.service }}"