Merge pull request #85 from mojaloop/feat/mojaloop-15.0.0

feat: added values files for mojalop, mojaloop-simulator and ttk

Author: vijayg10

Dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:20.04
 ARG TERRAFORM_VERSION=1.1.8
 ARG K8S_VERSION=v1.24.6
-ARG HELM_VERSION=v3.9.4
+ARG HELM_VERSION=v3.11.0
 ARG HELM_FILENAME=helm-${HELM_VERSION}-linux-amd64.tar.gz
 ARG KUBESPRAY_VERSION=2.20.0
 ARG NEWMAN_VERSION=5.0.0

gitlab_templates/gitlab_ci_templates/.gitlab-tests-ci.yml

@@ -1,10 +1,10 @@
 include:
-  - remote: 'https://raw.githubusercontent.com/mojaloop/iac-aws-platform/v3.0.1/gitlab_templates/gitlab_ci_templates/.gitlab-main-ci.yml'
-  - remote: 'https://raw.githubusercontent.com/mojaloop/iac-aws-platform/v3.0.1/gitlab_templates/gitlab_ci_templates/.gitlab-ops-ci.yml'
-  - remote: 'https://raw.githubusercontent.com/mojaloop/iac-aws-platform/v3.0.1/gitlab_templates/gitlab_ci_templates/.gitlab-tests-ci.yml'
+  - remote: 'https://raw.githubusercontent.com/mojaloop/iac-aws-platform/v4.0.0/gitlab_templates/gitlab_ci_templates/.gitlab-main-ci.yml'
+  - remote: 'https://raw.githubusercontent.com/mojaloop/iac-aws-platform/v4.0.0/gitlab_templates/gitlab_ci_templates/.gitlab-ops-ci.yml'
+  - remote: 'https://raw.githubusercontent.com/mojaloop/iac-aws-platform/v4.0.0/gitlab_templates/gitlab_ci_templates/.gitlab-tests-ci.yml'
 
 
 variables:
   GIT_SSL_NO_VERIFY: "true"
-  PLATFORM_IAC_IMAGE_VERSION: "3.0.1"
-  K3S_IAC_IMAGE_VERSION: "0.17.0"
+  PLATFORM_IAC_IMAGE_VERSION: "4.0.0"
+  K3S_IAC_IMAGE_VERSION: "0.19.0"

gitlab_templates/switch-iac/.gitlab-ci.yml

@@ -3,11 +3,11 @@ cloud_provider=aws
 use_bastion=true
 create_public_zone=yes
 create_private_zone=yes
-master_instance_type=t3.medium
-master_volume_size=100
-agent_node_count=2
-agent_instance_type=m5.xlarge
-agent_volume_size=100
+master_instance_type=m5.xlarge
+master_volume_size=200
+agent_node_count=3
+agent_instance_type=m5.2xlarge
+agent_volume_size=500
 ingress_name=nginx
 letsencrypt_email=[email protected]
 install_mojaloop=no
@@ -23,13 +23,13 @@ pm4ml_config_file=/k3s-boot/ansible_pm4ml_output.yaml
 pm4ml_static_config_file=/k3s-boot/static.pm4ml.values.yaml
 pm4ml_client_cert_remote_dir=/tmp/pm4ml-certoutput/
 pm4ml_client_cert_local_dir=/k3s-boot/certoutput/
-pm4ml_helm_version=7.0.7
+pm4ml_helm_version=8.0.1
 pm4ml_dfsp_internal_access_only=yes
 letsencrypt_server=production
 internal_pm4ml_instance=yes
 peer_vpc_id=##peer_vpc_id##
 create_vpc_peering=true
-vpc_cidr=10.105.0.0/23
+vpc_cidr=10.112.0.0/23
 k3s_version=v1.20.8+k3s1
 install_portainer=no
 internal_managed_tls=yes
@@ -39,4 +39,6 @@ use_aws_acm_cert=false
 grafana_internal_access_only=no
 ttk_enabled=no
 ttk_payee_simulator_enabled=no
+pm4ml_kafka_helm_version=15.2.1
+redis_replica_count=1
 az_count=1

gitlab_templates/switch-iac/k3s-sync-dir/.env

@@ -46,19 +46,20 @@ mojaloop-core-connector:
     repository: pm4ml/wallet-core-connector
     tag: 1.0.34
   env:
-    MLCONN_OUTBOUND_ENDPOINT: "http://{{ item.value.helm_release_name }}-scheme-adapter:4001"
+    MLCONN_OUTBOUND_ENDPOINT: "http://{{ item.value.helm_release_name }}-sdk-scheme-adapter-api-svc:4001"
     BACKEND_ENDPOINT: "http://sim-backend:3000"
   livenessProbe:
     enabled: true
   readinessProbe:
     enabled: true
 
 scheme-adapter:
-  env:
-    RESOURCE_VERSIONS: transfers=1.1,
-    RESERVE_NOTIFICATION: true
-    AUTO_ACCEPT_PARTY: true
-    AUTO_ACCEPT_QUOTES: true
+  sdk-scheme-adapter-api-svc:
+    env:
+      RESOURCE_VERSIONS: transfers=1.1,
+      RESERVE_NOTIFICATION: true
+      AUTO_ACCEPT_PARTY: true
+      AUTO_ACCEPT_QUOTES: true
 
 sim-backend:
   rules: |-