From b5200a6b53942fc5d9d6b3442c5a12ef9c14835f Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Mon, 9 Dec 2024 12:53:05 +0530
Subject: [PATCH 01/25] rds env aurora

---
 .../aws/support-svcs/deploy-rds-cluster/main.tf  | 16 +++++++++++++---
 .../support-svcs/deploy-rds-cluster/variables.tf |  5 +++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/terraform/aws/support-svcs/deploy-rds-cluster/main.tf b/terraform/aws/support-svcs/deploy-rds-cluster/main.tf
index 8772adc80..71c18a899 100644
--- a/terraform/aws/support-svcs/deploy-rds-cluster/main.tf
+++ b/terraform/aws/support-svcs/deploy-rds-cluster/main.tf
@@ -47,9 +47,10 @@ resource "aws_rds_cluster" "rds_cluster" {
 
   engine                    = var.engine
   engine_version            = var.engine_version
-  db_cluster_instance_class = var.instance_class
-  allocated_storage         = var.allocated_storage
+  db_cluster_instance_class = strcontains(var.engine, "aurora") ?  : ""
+  allocated_storage         = strcontains(var.engine, "aurora") ? var.allocated_storage
   storage_type              = var.storage_type
+  iops                      = var.iops  
   storage_encrypted         = var.storage_encrypted
   kms_key_id                = var.kms_key_id
 
@@ -66,7 +67,7 @@ resource "aws_rds_cluster" "rds_cluster" {
 
   network_type = var.network_type
 
-  iops = var.iops
+
 
   allow_major_version_upgrade  = var.allow_major_version_upgrade
   apply_immediately            = var.apply_immediately
@@ -88,4 +89,13 @@ resource "aws_rds_cluster" "rds_cluster" {
 
   tags = var.tags
 
+}
+
+resource "aws_rds_cluster_instance" "cluster_instances" {
+  count              = strcontains(var.engine, "aurora") ? var.replicas : 0
+  identifier         = "${var.identifier}-${count.index}"
+  cluster_identifier = aws_rds_cluster.rds_cluster[0].id
+  instance_class     = var.instance_class
+  engine             = aws_rds_cluster.rds_cluster[0].engine
+  engine_version     = aws_rds_cluster.rds_cluster[0].engine_version
 }
\ No newline at end of file
diff --git a/terraform/aws/support-svcs/deploy-rds-cluster/variables.tf b/terraform/aws/support-svcs/deploy-rds-cluster/variables.tf
index f2a80bf59..703572292 100644
--- a/terraform/aws/support-svcs/deploy-rds-cluster/variables.tf
+++ b/terraform/aws/support-svcs/deploy-rds-cluster/variables.tf
@@ -660,4 +660,9 @@ variable "master_user_password_rotation_schedule_expression" {
   description = "A cron() or rate() expression that defines the schedule for rotating your secret. Either automatically_after_days or schedule_expression must be specified."
   type        = string
   default     = null
+}
+
+variable "replicas"{
+  type        = number
+  default     = 2
 }
\ No newline at end of file

From 58243f7ab41db5450f71637f76566911bf24bc17 Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Mon, 9 Dec 2024 13:19:51 +0530
Subject: [PATCH 02/25] replicas

---
 .../aws/support-svcs/deploy-rds/infra.tf      |  1 +
 .../mojaloop-stateful-resources-managed.yaml  | 30 +++++++++++--------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/terraform/aws/support-svcs/deploy-rds/infra.tf b/terraform/aws/support-svcs/deploy-rds/infra.tf
index 06a637504..2e5fa992c 100644
--- a/terraform/aws/support-svcs/deploy-rds/infra.tf
+++ b/terraform/aws/support-svcs/deploy-rds/infra.tf
@@ -21,6 +21,7 @@ module "rds" {
   iops                 = each.value.external_resource_config.storage_iops
   multi_az            = each.value.external_resource_config.multi_az
   skip_final_snapshot = each.value.external_resource_config.skip_final_snapshot
+  replicas            = each.value.external_resource_config.replicas
 
   db_name  = each.value.external_resource_config.db_name
   username = each.value.external_resource_config.username
diff --git a/terraform/k8s/default-config/mojaloop-stateful-resources-managed.yaml b/terraform/k8s/default-config/mojaloop-stateful-resources-managed.yaml
index 72c19c256..01f05b11a 100644
--- a/terraform/k8s/default-config/mojaloop-stateful-resources-managed.yaml
+++ b/terraform/k8s/default-config/mojaloop-stateful-resources-managed.yaml
@@ -8,10 +8,11 @@ mcm-db:
     backup_window: 01:00-04:00
     db_name: mcm
     deletion_protection: false
-    engine: mysql
+    engine: 8.0.mysql_aurora.3.04.0
     engine_version: "8.0"
     family: mysql8.0
-    instance_class: db.m5d.large
+    instance_class: db.t3.medium
+    replicas: 2
     maintenance_window: Sun:04:00-Sun:06:00
     major_engine_version: "8.0"
     monitoring_interval: "30"
@@ -49,10 +50,11 @@ account-lookup-db:
     backup_window: 01:00-04:00
     db_name: account_lookup
     deletion_protection: false
-    engine: mysql
+    engine: 8.0.mysql_aurora.3.04.0
     engine_version: "8.0"
     family: mysql8.0
-    instance_class: db.m5d.large
+    instance_class: db.t3.medium
+    replicas: 2
     maintenance_window: Sun:04:00-Sun:06:00
     major_engine_version: "8.0"
     monitoring_interval: "30"
@@ -88,10 +90,11 @@ central-ledger-db:
     backup_window: 01:00-04:00
     db_name: central_ledger
     deletion_protection: false
-    engine: mysql
+    engine: 8.0.mysql_aurora.3.04.0
     engine_version: "8.0"
     family: mysql8.0
-    instance_class: db.m5d.large
+    instance_class: db.t3.medium
+    replicas: 2
     maintenance_window: Sun:04:00-Sun:06:00
     major_engine_version: "8.0"
     monitoring_interval: "30"
@@ -236,10 +239,11 @@ keycloak-db:
     backup_window: 01:00-04:00
     db_name: keycloak
     deletion_protection: false
-    engine: mysql
+    engine: 8.0.mysql_aurora.3.04.0
     engine_version: "8.0"
     family: mysql8.0
-    instance_class: db.m5d.large
+    instance_class: db.t3.medium
+    replicas: 2
     maintenance_window: Sun:04:00-Sun:06:00
     major_engine_version: "8.0"
     monitoring_interval: "30"
@@ -275,10 +279,11 @@ keto-db:
     backup_window: 01:00-04:00
     db_name: keto
     deletion_protection: false
-    engine: mysql
+    engine: 8.0.mysql_aurora.3.04.0
     engine_version: "8.0"
     family: mysql8.0
-    instance_class: db.m5d.large
+    instance_class: db.t3.medium
+    replicas: 2
     maintenance_window: Sun:04:00-Sun:06:00
     major_engine_version: "8.0"
     monitoring_interval: "30"
@@ -314,10 +319,11 @@ kratos-db:
     backup_window: 01:00-04:00
     db_name: kratos
     deletion_protection: false
-    engine: mysql
+    engine: 8.0.mysql_aurora.3.04.0
     engine_version: "8.0"
     family: mysql8.0
-    instance_class: db.m5d.large
+    instance_class: db.t3.medium
+    replicas: 2
     maintenance_window: Sun:04:00-Sun:06:00
     major_engine_version: "8.0"
     monitoring_interval: "30"

From f1262eb9ed9ab7778256d1e9c3f24b092b7a3085 Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Mon, 9 Dec 2024 13:40:38 +0530
Subject: [PATCH 03/25] config

---
 .../mojaloop-stateful-resources-managed.yaml  | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/terraform/k8s/default-config/mojaloop-stateful-resources-managed.yaml b/terraform/k8s/default-config/mojaloop-stateful-resources-managed.yaml
index 01f05b11a..f943c1486 100644
--- a/terraform/k8s/default-config/mojaloop-stateful-resources-managed.yaml
+++ b/terraform/k8s/default-config/mojaloop-stateful-resources-managed.yaml
@@ -8,9 +8,9 @@ mcm-db:
     backup_window: 01:00-04:00
     db_name: mcm
     deletion_protection: false
-    engine: 8.0.mysql_aurora.3.04.0
-    engine_version: "8.0"
-    family: mysql8.0
+    engine: aurora-mysql
+    engine_version: 8.0.mysql_aurora.3.04.0
+    family: aurora-mysql8.0
     instance_class: db.t3.medium
     replicas: 2
     maintenance_window: Sun:04:00-Sun:06:00
@@ -50,9 +50,9 @@ account-lookup-db:
     backup_window: 01:00-04:00
     db_name: account_lookup
     deletion_protection: false
-    engine: 8.0.mysql_aurora.3.04.0
-    engine_version: "8.0"
-    family: mysql8.0
+    engine: aurora-mysql
+    engine_version: 8.0.mysql_aurora.3.04.0
+    family: aurora-mysql8.0
     instance_class: db.t3.medium
     replicas: 2
     maintenance_window: Sun:04:00-Sun:06:00
@@ -90,9 +90,9 @@ central-ledger-db:
     backup_window: 01:00-04:00
     db_name: central_ledger
     deletion_protection: false
-    engine: 8.0.mysql_aurora.3.04.0
-    engine_version: "8.0"
-    family: mysql8.0
+    engine: aurora-mysql
+    engine_version: 8.0.mysql_aurora.3.04.0
+    family: aurora-mysql8.0
     instance_class: db.t3.medium
     replicas: 2
     maintenance_window: Sun:04:00-Sun:06:00
@@ -239,9 +239,9 @@ keycloak-db:
     backup_window: 01:00-04:00
     db_name: keycloak
     deletion_protection: false
-    engine: 8.0.mysql_aurora.3.04.0
-    engine_version: "8.0"
-    family: mysql8.0
+    engine: aurora-mysql
+    engine_version: 8.0.mysql_aurora.3.04.0
+    family: aurora-mysql8.0
     instance_class: db.t3.medium
     replicas: 2
     maintenance_window: Sun:04:00-Sun:06:00
@@ -279,9 +279,9 @@ keto-db:
     backup_window: 01:00-04:00
     db_name: keto
     deletion_protection: false
-    engine: 8.0.mysql_aurora.3.04.0
-    engine_version: "8.0"
-    family: mysql8.0
+    engine: aurora-mysql
+    engine_version: 8.0.mysql_aurora.3.04.0
+    family: aurora-mysql8.0
     instance_class: db.t3.medium
     replicas: 2
     maintenance_window: Sun:04:00-Sun:06:00
@@ -319,9 +319,9 @@ kratos-db:
     backup_window: 01:00-04:00
     db_name: kratos
     deletion_protection: false
-    engine: 8.0.mysql_aurora.3.04.0
-    engine_version: "8.0"
-    family: mysql8.0
+    engine: aurora-mysql
+    engine_version: 8.0.mysql_aurora.3.04.0
+    family: aurora-mysql8.0
     instance_class: db.t3.medium
     replicas: 2
     maintenance_window: Sun:04:00-Sun:06:00

From 7d1739525e6f35a01a530683d37fbae1ecbb80b6 Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Mon, 9 Dec 2024 13:46:07 +0530
Subject: [PATCH 04/25] aurora non

---
 terraform/aws/support-svcs/deploy-rds-cluster/main.tf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/terraform/aws/support-svcs/deploy-rds-cluster/main.tf b/terraform/aws/support-svcs/deploy-rds-cluster/main.tf
index 71c18a899..b86440a74 100644
--- a/terraform/aws/support-svcs/deploy-rds-cluster/main.tf
+++ b/terraform/aws/support-svcs/deploy-rds-cluster/main.tf
@@ -47,10 +47,10 @@ resource "aws_rds_cluster" "rds_cluster" {
 
   engine                    = var.engine
   engine_version            = var.engine_version
-  db_cluster_instance_class = strcontains(var.engine, "aurora") ?  : ""
-  allocated_storage         = strcontains(var.engine, "aurora") ? var.allocated_storage
-  storage_type              = var.storage_type
-  iops                      = var.iops  
+  db_cluster_instance_class = strcontains(var.engine, "aurora") ?  null : var.instance_class
+  allocated_storage         = strcontains(var.engine, "aurora") ?  null : var.allocated_storage
+  storage_type              = strcontains(var.engine, "aurora") ?  null : var.storage_type
+  iops                      = strcontains(var.engine, "aurora") ?  null : var.iops
   storage_encrypted         = var.storage_encrypted
   kms_key_id                = var.kms_key_id
 

From 3e11cbf4cd6a2e660ae32ef371f5aba5bf9f7a47 Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Mon, 9 Dec 2024 14:21:40 +0530
Subject: [PATCH 05/25] regex

---
 terraform/aws/support-svcs/deploy-rds-cluster/main.tf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/terraform/aws/support-svcs/deploy-rds-cluster/main.tf b/terraform/aws/support-svcs/deploy-rds-cluster/main.tf
index b86440a74..c65302062 100644
--- a/terraform/aws/support-svcs/deploy-rds-cluster/main.tf
+++ b/terraform/aws/support-svcs/deploy-rds-cluster/main.tf
@@ -47,10 +47,10 @@ resource "aws_rds_cluster" "rds_cluster" {
 
   engine                    = var.engine
   engine_version            = var.engine_version
-  db_cluster_instance_class = strcontains(var.engine, "aurora") ?  null : var.instance_class
-  allocated_storage         = strcontains(var.engine, "aurora") ?  null : var.allocated_storage
-  storage_type              = strcontains(var.engine, "aurora") ?  null : var.storage_type
-  iops                      = strcontains(var.engine, "aurora") ?  null : var.iops
+  db_cluster_instance_class = regex("aurora", var.engine) ?  null : var.instance_class
+  allocated_storage         = regex("aurora", var.engine) ?  null : var.allocated_storage
+  storage_type              = regex("aurora", var.engine) ?  null : var.storage_type
+  iops                      = regex("aurora", var.engine) ?  null : var.iops
   storage_encrypted         = var.storage_encrypted
   kms_key_id                = var.kms_key_id
 

From acb9195d73dda07eab07cfdadf59ddfe7a8a9691 Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Mon, 9 Dec 2024 14:24:56 +0530
Subject: [PATCH 06/25] replicas

---
 terraform/aws/support-svcs/deploy-rds-cluster/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/aws/support-svcs/deploy-rds-cluster/main.tf b/terraform/aws/support-svcs/deploy-rds-cluster/main.tf
index c65302062..3d20dc7b8 100644
--- a/terraform/aws/support-svcs/deploy-rds-cluster/main.tf
+++ b/terraform/aws/support-svcs/deploy-rds-cluster/main.tf
@@ -92,7 +92,7 @@ resource "aws_rds_cluster" "rds_cluster" {
 }
 
 resource "aws_rds_cluster_instance" "cluster_instances" {
-  count              = strcontains(var.engine, "aurora") ? var.replicas : 0
+  count              = regex("aurora", var.engine)? var.replicas : 0
   identifier         = "${var.identifier}-${count.index}"
   cluster_identifier = aws_rds_cluster.rds_cluster[0].id
   instance_class     = var.instance_class

From 83a175102c8855ec79802955955d096e4471ef2f Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Mon, 9 Dec 2024 14:32:05 +0530
Subject: [PATCH 07/25] aurora check

---
 .../aws/support-svcs/deploy-rds-cluster/main.tf    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/terraform/aws/support-svcs/deploy-rds-cluster/main.tf b/terraform/aws/support-svcs/deploy-rds-cluster/main.tf
index 3d20dc7b8..8264434e5 100644
--- a/terraform/aws/support-svcs/deploy-rds-cluster/main.tf
+++ b/terraform/aws/support-svcs/deploy-rds-cluster/main.tf
@@ -1,3 +1,7 @@
+locals {
+  is_aurora = try(regex("aurora", var.engine),"") == "aurora" ? true : false
+}
+
 module "db_subnet_group" {
   source = "terraform-aws-modules/rds/aws//modules/db_subnet_group"
 
@@ -47,10 +51,10 @@ resource "aws_rds_cluster" "rds_cluster" {
 
   engine                    = var.engine
   engine_version            = var.engine_version
-  db_cluster_instance_class = regex("aurora", var.engine) ?  null : var.instance_class
-  allocated_storage         = regex("aurora", var.engine) ?  null : var.allocated_storage
-  storage_type              = regex("aurora", var.engine) ?  null : var.storage_type
-  iops                      = regex("aurora", var.engine) ?  null : var.iops
+  db_cluster_instance_class = local.is_aurora ?  null : var.instance_class
+  allocated_storage         = local.is_aurora ?  null : var.allocated_storage
+  storage_type              = local.is_aurora ?  null : var.storage_type
+  iops                      = local.is_aurora ?  null : var.iops
   storage_encrypted         = var.storage_encrypted
   kms_key_id                = var.kms_key_id
 
@@ -92,7 +96,7 @@ resource "aws_rds_cluster" "rds_cluster" {
 }
 
 resource "aws_rds_cluster_instance" "cluster_instances" {
-  count              = regex("aurora", var.engine)? var.replicas : 0
+  count              = local.is_aurora ? var.replicas : 0
   identifier         = "${var.identifier}-${count.index}"
   cluster_identifier = aws_rds_cluster.rds_cluster[0].id
   instance_class     = var.instance_class

From 4d748247e1c06ed9f92ffc167aed26b3d1180356 Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Mon, 9 Dec 2024 14:55:58 +0530
Subject: [PATCH 08/25] sql require primary key removed

---
 .../k8s/default-config/mojaloop-stateful-resources-managed.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/terraform/k8s/default-config/mojaloop-stateful-resources-managed.yaml b/terraform/k8s/default-config/mojaloop-stateful-resources-managed.yaml
index f943c1486..d2ee8d336 100644
--- a/terraform/k8s/default-config/mojaloop-stateful-resources-managed.yaml
+++ b/terraform/k8s/default-config/mojaloop-stateful-resources-managed.yaml
@@ -28,8 +28,6 @@ mcm-db:
         value: utf8mb4
       - name: character_set_server
         value: utf8mb4
-      - name: sql_require_primary_key
-        value: OFF
     port: "3306"
     skip_final_snapshot: true
     multi_az: false

From e3cf45ee8104cf4b4798756a14d51f05103c06fe Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Mon, 9 Dec 2024 15:04:38 +0530
Subject: [PATCH 09/25] storage encryptino

---
 .../mojaloop-stateful-resources-managed.yaml         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/terraform/k8s/default-config/mojaloop-stateful-resources-managed.yaml b/terraform/k8s/default-config/mojaloop-stateful-resources-managed.yaml
index d2ee8d336..7552b28a0 100644
--- a/terraform/k8s/default-config/mojaloop-stateful-resources-managed.yaml
+++ b/terraform/k8s/default-config/mojaloop-stateful-resources-managed.yaml
@@ -31,7 +31,7 @@ mcm-db:
     port: "3306"
     skip_final_snapshot: true
     multi_az: false
-    storage_encrypted: false
+    storage_encrypted: true
     tags:
       Origin: Terraform
       mojaloop/cost_center: mlf-iac-sandbox
@@ -71,7 +71,7 @@ account-lookup-db:
     port: "3306"
     skip_final_snapshot: true
     multi_az: false
-    storage_encrypted: false
+    storage_encrypted: true
     tags:
       Origin: Terraform
       mojaloop/cost_center: mlf-iac-sandbox
@@ -111,7 +111,7 @@ central-ledger-db:
     port: "3306"
     skip_final_snapshot: true
     multi_az: false
-    storage_encrypted: false
+    storage_encrypted: true
     tags:
       Origin: Terraform
       mojaloop/cost_center: mlf-iac-sandbox
@@ -260,7 +260,7 @@ keycloak-db:
     port: "3306"
     skip_final_snapshot: true
     multi_az: false
-    storage_encrypted: false
+    storage_encrypted: true
     tags:
       Origin: Terraform
       mojaloop/cost_center: mlf-iac-sandbox
@@ -300,7 +300,7 @@ keto-db:
     port: "3306"
     skip_final_snapshot: true
     multi_az: false
-    storage_encrypted: false
+    storage_encrypted: true
     tags:
       Origin: Terraform
       mojaloop/cost_center: mlf-iac-sandbox
@@ -340,7 +340,7 @@ kratos-db:
     port: "3306"
     skip_final_snapshot: true
     multi_az: false
-    storage_encrypted: false
+    storage_encrypted: true
     tags:
       Origin: Terraform
       mojaloop/cost_center: mlf-iac-sandbox

From e54318ae0355ae51724ee2ebd7ae1ff0d89ac7d7 Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Mon, 9 Dec 2024 16:59:27 +0530
Subject: [PATCH 10/25] mongodb collmod

---
 .../percona/mongodb/db-cluster.yaml.tpl              |  2 +-
 .../mojaloop-stateful-resources-managed.yaml         | 12 ++++++------
 .../default-config/platform-stateful-resources.yaml  |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl b/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
index 77e5017f9..782111ae2 100644
--- a/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
+++ b/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
@@ -665,7 +665,7 @@ spec:
           args:
             - >
                echo "use ${database_name}" >> ~/init.js;       
-               echo "db.createUser({user: \"${database_user}\",pwd: process.env.MONGODB_USER_PASSWORD,roles: [{ db: \"${database_name}\", role: \"readWrite\" }],mechanisms: [\"SCRAM-SHA-1\"]})" >> ~/init.js;
+               echo "db.createUser({user: \"${database_user}\",pwd: process.env.MONGODB_USER_PASSWORD,roles: [{ db: \"${database_name}\", role: \"readWrite\" },{ db: \"${database_name}\", role: \"collMod\" }],mechanisms: [\"SCRAM-SHA-1\"]})" >> ~/init.js;
                chmod +x ~/init.js;
                echo "running init.js";
                mongosh "mongodb://$${MONGODB_USER_ADMIN_USER}:$${MONGODB_USER_ADMIN_PASSWORD}@${cluster_name}-mongos" < ~/init.js
diff --git a/terraform/k8s/default-config/mojaloop-stateful-resources-managed.yaml b/terraform/k8s/default-config/mojaloop-stateful-resources-managed.yaml
index 7552b28a0..a98480e54 100644
--- a/terraform/k8s/default-config/mojaloop-stateful-resources-managed.yaml
+++ b/terraform/k8s/default-config/mojaloop-stateful-resources-managed.yaml
@@ -12,7 +12,7 @@ mcm-db:
     engine_version: 8.0.mysql_aurora.3.04.0
     family: aurora-mysql8.0
     instance_class: db.t3.medium
-    replicas: 2
+    replicas: 1
     maintenance_window: Sun:04:00-Sun:06:00
     major_engine_version: "8.0"
     monitoring_interval: "30"
@@ -52,7 +52,7 @@ account-lookup-db:
     engine_version: 8.0.mysql_aurora.3.04.0
     family: aurora-mysql8.0
     instance_class: db.t3.medium
-    replicas: 2
+    replicas: 1
     maintenance_window: Sun:04:00-Sun:06:00
     major_engine_version: "8.0"
     monitoring_interval: "30"
@@ -92,7 +92,7 @@ central-ledger-db:
     engine_version: 8.0.mysql_aurora.3.04.0
     family: aurora-mysql8.0
     instance_class: db.t3.medium
-    replicas: 2
+    replicas: 1
     maintenance_window: Sun:04:00-Sun:06:00
     major_engine_version: "8.0"
     monitoring_interval: "30"
@@ -241,7 +241,7 @@ keycloak-db:
     engine_version: 8.0.mysql_aurora.3.04.0
     family: aurora-mysql8.0
     instance_class: db.t3.medium
-    replicas: 2
+    replicas: 1
     maintenance_window: Sun:04:00-Sun:06:00
     major_engine_version: "8.0"
     monitoring_interval: "30"
@@ -281,7 +281,7 @@ keto-db:
     engine_version: 8.0.mysql_aurora.3.04.0
     family: aurora-mysql8.0
     instance_class: db.t3.medium
-    replicas: 2
+    replicas: 1
     maintenance_window: Sun:04:00-Sun:06:00
     major_engine_version: "8.0"
     monitoring_interval: "30"
@@ -321,7 +321,7 @@ kratos-db:
     engine_version: 8.0.mysql_aurora.3.04.0
     family: aurora-mysql8.0
     instance_class: db.t3.medium
-    replicas: 2
+    replicas: 1
     maintenance_window: Sun:04:00-Sun:06:00
     major_engine_version: "8.0"
     monitoring_interval: "30"
diff --git a/terraform/k8s/default-config/platform-stateful-resources.yaml b/terraform/k8s/default-config/platform-stateful-resources.yaml
index fc76c4446..637217002 100644
--- a/terraform/k8s/default-config/platform-stateful-resources.yaml
+++ b/terraform/k8s/default-config/platform-stateful-resources.yaml
@@ -131,7 +131,7 @@ bulk-mongodb:
   enabled: true
   app_owner: "mojaloop"
   resource_type: mongodb
-  deployment_type: helm-chart
+  deployment_type: operator
   logical_service_config:
     logical_service_port: 27017
     logical_service_name: bulk-mongodb-svc
@@ -153,7 +153,7 @@ cep-mongodb:
   enabled: false
   app_owner: "mojaloop"
   resource_type: mongodb
-  deployment_type: helm-chart
+  deployment_type: operator
   logical_service_config:
     logical_service_port: 27017
     logical_service_name: mongodb-cep-mongodb
@@ -175,7 +175,7 @@ reporting-events-mongodb:
   enabled: true
   app_owner: "mojaloop"
   resource_type: mongodb
-  deployment_type: helm-chart
+  deployment_type: operator
   logical_service_config:
     logical_service_port: 27017
     logical_service_name: mongodb-reporting-events-mongodb
@@ -257,7 +257,7 @@ ttk-mongodb:
   enabled: true
   app_owner: "mojaloop"
   resource_type: mongodb
-  deployment_type: helm-chart
+  deployment_type: operator
   logical_service_config:
     logical_service_port: 27017
     logical_service_name: ttk-mongodb-svc

From 7f3de776b6afdb5ba7a65f7114bc0af725bcdc9e Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Tue, 10 Dec 2024 11:36:24 +0530
Subject: [PATCH 11/25] additional privileges

---
 .../stateful-resources/stateful-resources-config.tf      | 1 +
 .../percona/mongodb/db-cluster.yaml.tpl                  | 9 ++++++++-
 .../mojaloop-stateful-resources-local-operator.yaml      | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/terraform/gitops/stateful-resources/stateful-resources-config.tf b/terraform/gitops/stateful-resources/stateful-resources-config.tf
index 7e1eca0da..171c90068 100644
--- a/terraform/gitops/stateful-resources/stateful-resources-config.tf
+++ b/terraform/gitops/stateful-resources/stateful-resources-config.tf
@@ -132,6 +132,7 @@ resource "local_file" "percona-crs" {
       mongod_replica_count              = each.value.logical_service_config.replica_count
       percona_server_mongodb_version    = each.value.resource_type == "mongodb" ? each.value.local_operator_config.percona_server_mongodb_version : ""
       percona_backup_mongodb_version    = each.value.resource_type == "mongodb" ? each.value.local_operator_config.percona_backup_mongodb_version : ""
+      additional_privileges             = each.value.resource_type == "mongodb" ? each.value.local_operator_config.additional_privileges : ""
 
 
       ceph_percona_backup_bucket = var.ceph_percona_backup_bucket
diff --git a/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl b/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
index 782111ae2..aa3dbf3c6 100644
--- a/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
+++ b/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
@@ -665,7 +665,14 @@ spec:
           args:
             - >
                echo "use ${database_name}" >> ~/init.js;       
-               echo "db.createUser({user: \"${database_user}\",pwd: process.env.MONGODB_USER_PASSWORD,roles: [{ db: \"${database_name}\", role: \"readWrite\" },{ db: \"${database_name}\", role: \"collMod\" }],mechanisms: [\"SCRAM-SHA-1\"]})" >> ~/init.js;
+               echo "db.createUser({user: \"${database_user}\",pwd: process.env.MONGODB_USER_PASSWORD,roles: [{ db: \"${database_name}\", role: \"readWrite\" }],mechanisms: [\"SCRAM-SHA-1\"]})" >> ~/init.js;
+%{ for privilege in additional_privileges ~}
+               echo "db.runCommand({ createRole: \"additionalRole\", privileges: [{ resource: { db: \"${database_name}\", collection: \"${privilege.collection}\" }, actions: \"${privilege.actions}\" }], roles: [] })" >> ~/init.js;
+%{ endfor ~}
+%{ if additional_privileges != null ~}
+               echo "db.updateUser(\"${database_user}\", { roles: [ { role: "additionalRole", db: \"${database_user}\" }]})" >> ~/init.js;
+%{ endif ~}                 
+               echo " >> ~/init.js;
                chmod +x ~/init.js;
                echo "running init.js";
                mongosh "mongodb://$${MONGODB_USER_ADMIN_USER}:$${MONGODB_USER_ADMIN_PASSWORD}@${cluster_name}-mongos" < ~/init.js
diff --git a/terraform/k8s/default-config/mojaloop-stateful-resources-local-operator.yaml b/terraform/k8s/default-config/mojaloop-stateful-resources-local-operator.yaml
index 292e735bf..a73b58a5c 100644
--- a/terraform/k8s/default-config/mojaloop-stateful-resources-local-operator.yaml
+++ b/terraform/k8s/default-config/mojaloop-stateful-resources-local-operator.yaml
@@ -348,6 +348,7 @@ bulk-mongodb:
       storage_class_name: longhorn
       service_port: 27017
       affinity_definition: {}
+    additional_privileges: []
 cep-mongodb:
   local_operator_config:
     cr_version: 1.16.2
@@ -389,6 +390,7 @@ cep-mongodb:
       storage_class_name: longhorn
       service_port: 27017
       affinity_definition: {}
+    additional_privileges: []      
 reporting-events-mongodb:
   local_operator_config:
     cr_version: 1.16.2
@@ -430,6 +432,9 @@ reporting-events-mongodb:
       storage_class_name: longhorn
       service_port: 27017
       affinity_definition: {}
+    additional_privileges:
+      - collection: reporting
+        actions: ["collMod"]
 mojaloop-kafka:
   local_operator_config:
     resource_namespace: mojaloop

From baa84a1da07f06d01937bfb8d794c46b616a399c Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Tue, 10 Dec 2024 12:45:00 +0530
Subject: [PATCH 12/25] type

---
 .../gitops/stateful-resources/stateful-resources-config.tf      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/gitops/stateful-resources/stateful-resources-config.tf b/terraform/gitops/stateful-resources/stateful-resources-config.tf
index 171c90068..4ea5ca73d 100644
--- a/terraform/gitops/stateful-resources/stateful-resources-config.tf
+++ b/terraform/gitops/stateful-resources/stateful-resources-config.tf
@@ -132,7 +132,7 @@ resource "local_file" "percona-crs" {
       mongod_replica_count              = each.value.logical_service_config.replica_count
       percona_server_mongodb_version    = each.value.resource_type == "mongodb" ? each.value.local_operator_config.percona_server_mongodb_version : ""
       percona_backup_mongodb_version    = each.value.resource_type == "mongodb" ? each.value.local_operator_config.percona_backup_mongodb_version : ""
-      additional_privileges             = each.value.resource_type == "mongodb" ? each.value.local_operator_config.additional_privileges : ""
+      additional_privileges             = each.value.resource_type == "mongodb" ? each.value.local_operator_config.additional_privileges : []
 
 
       ceph_percona_backup_bucket = var.ceph_percona_backup_bucket

From cc2c2f07fb76d95476ab6dd207d8df890aaab917 Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Tue, 10 Dec 2024 12:53:53 +0530
Subject: [PATCH 13/25] change in type

---
 .../stateful-resources/percona/mongodb/db-cluster.yaml.tpl      | 2 +-
 .../mojaloop-stateful-resources-local-operator.yaml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl b/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
index aa3dbf3c6..f3530c501 100644
--- a/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
+++ b/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
@@ -667,7 +667,7 @@ spec:
                echo "use ${database_name}" >> ~/init.js;       
                echo "db.createUser({user: \"${database_user}\",pwd: process.env.MONGODB_USER_PASSWORD,roles: [{ db: \"${database_name}\", role: \"readWrite\" }],mechanisms: [\"SCRAM-SHA-1\"]})" >> ~/init.js;
 %{ for privilege in additional_privileges ~}
-               echo "db.runCommand({ createRole: \"additionalRole\", privileges: [{ resource: { db: \"${database_name}\", collection: \"${privilege.collection}\" }, actions: \"${privilege.actions}\" }], roles: [] })" >> ~/init.js;
+               echo "db.runCommand({ createRole: \"additionalRole\", privileges: [{ resource: { db: \"${database_name}\", collection: \"${privilege.collection}\" }, actions: [\"${privilege.action}\"] }], roles: [] })" >> ~/init.js;
 %{ endfor ~}
 %{ if additional_privileges != null ~}
                echo "db.updateUser(\"${database_user}\", { roles: [ { role: "additionalRole", db: \"${database_user}\" }]})" >> ~/init.js;
diff --git a/terraform/k8s/default-config/mojaloop-stateful-resources-local-operator.yaml b/terraform/k8s/default-config/mojaloop-stateful-resources-local-operator.yaml
index a73b58a5c..ef4516feb 100644
--- a/terraform/k8s/default-config/mojaloop-stateful-resources-local-operator.yaml
+++ b/terraform/k8s/default-config/mojaloop-stateful-resources-local-operator.yaml
@@ -434,7 +434,7 @@ reporting-events-mongodb:
       affinity_definition: {}
     additional_privileges:
       - collection: reporting
-        actions: ["collMod"]
+        action: "collMod"
 mojaloop-kafka:
   local_operator_config:
     resource_namespace: mojaloop

From 13fbef512a6ecdb16d2746854e8bb1dfe93d44ab Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Tue, 10 Dec 2024 13:04:04 +0530
Subject: [PATCH 14/25] missing conf

---
 .../mojaloop-stateful-resources-local-operator.yaml              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/terraform/k8s/default-config/mojaloop-stateful-resources-local-operator.yaml b/terraform/k8s/default-config/mojaloop-stateful-resources-local-operator.yaml
index ef4516feb..f4b82e30b 100644
--- a/terraform/k8s/default-config/mojaloop-stateful-resources-local-operator.yaml
+++ b/terraform/k8s/default-config/mojaloop-stateful-resources-local-operator.yaml
@@ -515,6 +515,7 @@ ttk-mongodb:
       storage_class_name: longhorn
       service_port: 27017
       affinity_definition: {}
+    additional_privileges: []      
 
 keycloak-db:
   local_operator_config:

From 2a295c8b3c2bd9f2ffec90c103d53474783c351c Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Tue, 10 Dec 2024 13:19:58 +0530
Subject: [PATCH 15/25] check

---
 .../stateful-resources/percona/mongodb/db-cluster.yaml.tpl      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl b/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
index f3530c501..670b63d78 100644
--- a/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
+++ b/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
@@ -669,7 +669,7 @@ spec:
 %{ for privilege in additional_privileges ~}
                echo "db.runCommand({ createRole: \"additionalRole\", privileges: [{ resource: { db: \"${database_name}\", collection: \"${privilege.collection}\" }, actions: [\"${privilege.action}\"] }], roles: [] })" >> ~/init.js;
 %{ endfor ~}
-%{ if additional_privileges != null ~}
+%{ if additional_privileges != [] ~}
                echo "db.updateUser(\"${database_user}\", { roles: [ { role: "additionalRole", db: \"${database_user}\" }]})" >> ~/init.js;
 %{ endif ~}                 
                echo " >> ~/init.js;

From 45809b438e6397fdf7d440461180ee6d24ff1de3 Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Tue, 10 Dec 2024 13:28:33 +0530
Subject: [PATCH 16/25] additional role

---
 .../stateful-resources/percona/mongodb/db-cluster.yaml.tpl      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl b/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
index 670b63d78..c9fe88b8f 100644
--- a/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
+++ b/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
@@ -670,7 +670,7 @@ spec:
                echo "db.runCommand({ createRole: \"additionalRole\", privileges: [{ resource: { db: \"${database_name}\", collection: \"${privilege.collection}\" }, actions: [\"${privilege.action}\"] }], roles: [] })" >> ~/init.js;
 %{ endfor ~}
 %{ if additional_privileges != [] ~}
-               echo "db.updateUser(\"${database_user}\", { roles: [ { role: "additionalRole", db: \"${database_user}\" }]})" >> ~/init.js;
+               echo "db.updateUser(\"${database_user}\", { roles: [ { role: \"additionalRole\", db: \"${database_user}\" }]})" >> ~/init.js;
 %{ endif ~}                 
                echo " >> ~/init.js;
                chmod +x ~/init.js;

From 6780889be4f804c3c025b03d9a44b589d1fc3744 Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Tue, 10 Dec 2024 15:04:14 +0530
Subject: [PATCH 17/25] fix

---
 .../stateful-resources/percona/mongodb/db-cluster.yaml.tpl       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl b/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
index c9fe88b8f..420a9206b 100644
--- a/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
+++ b/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
@@ -672,7 +672,6 @@ spec:
 %{ if additional_privileges != [] ~}
                echo "db.updateUser(\"${database_user}\", { roles: [ { role: \"additionalRole\", db: \"${database_user}\" }]})" >> ~/init.js;
 %{ endif ~}                 
-               echo " >> ~/init.js;
                chmod +x ~/init.js;
                echo "running init.js";
                mongosh "mongodb://$${MONGODB_USER_ADMIN_USER}:$${MONGODB_USER_ADMIN_PASSWORD}@${cluster_name}-mongos" < ~/init.js

From 522e1e6ba6f2e472a84e130d4dce6c0557d04bd4 Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Tue, 10 Dec 2024 19:34:36 +0530
Subject: [PATCH 18/25] dbCreateRole

---
 .../stateful-resources/percona/mongodb/db-cluster.yaml.tpl    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl b/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
index 420a9206b..d33b5cfdc 100644
--- a/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
+++ b/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
@@ -667,10 +667,10 @@ spec:
                echo "use ${database_name}" >> ~/init.js;       
                echo "db.createUser({user: \"${database_user}\",pwd: process.env.MONGODB_USER_PASSWORD,roles: [{ db: \"${database_name}\", role: \"readWrite\" }],mechanisms: [\"SCRAM-SHA-1\"]})" >> ~/init.js;
 %{ for privilege in additional_privileges ~}
-               echo "db.runCommand({ createRole: \"additionalRole\", privileges: [{ resource: { db: \"${database_name}\", collection: \"${privilege.collection}\" }, actions: [\"${privilege.action}\"] }], roles: [] })" >> ~/init.js;
+               echo "db.createRole({ createRole: \"additionalRole\", privileges: [{ resource: { db: \"${database_name}\", collection: \"${privilege.collection}\" }, actions: [\"${privilege.action}\"] }], roles: [] })" >> ~/init.js;
 %{ endfor ~}
 %{ if additional_privileges != [] ~}
-               echo "db.updateUser(\"${database_user}\", { roles: [ { role: \"additionalRole\", db: \"${database_user}\" }]})" >> ~/init.js;
+               echo "db.updateUser(\"${database_user}\", { roles: [ { db: \"${database_name}\", role: \"readWrite\" },{ role: \"additionalRole\", db: \"${database_user}\" }]})" >> ~/init.js;
 %{ endif ~}                 
                chmod +x ~/init.js;
                echo "running init.js";

From 431cd25d22ff56141564c1cbf5920bfda577e399 Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Tue, 10 Dec 2024 19:36:57 +0530
Subject: [PATCH 19/25] correction

---
 .../stateful-resources/percona/mongodb/db-cluster.yaml.tpl      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl b/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
index d33b5cfdc..83d5dbb32 100644
--- a/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
+++ b/terraform/gitops/stateful-resources/templates/stateful-resources/percona/mongodb/db-cluster.yaml.tpl
@@ -667,7 +667,7 @@ spec:
                echo "use ${database_name}" >> ~/init.js;       
                echo "db.createUser({user: \"${database_user}\",pwd: process.env.MONGODB_USER_PASSWORD,roles: [{ db: \"${database_name}\", role: \"readWrite\" }],mechanisms: [\"SCRAM-SHA-1\"]})" >> ~/init.js;
 %{ for privilege in additional_privileges ~}
-               echo "db.createRole({ createRole: \"additionalRole\", privileges: [{ resource: { db: \"${database_name}\", collection: \"${privilege.collection}\" }, actions: [\"${privilege.action}\"] }], roles: [] })" >> ~/init.js;
+               echo "db.createRole({ role: \"additionalRole\", privileges: [{ resource: { db: \"${database_name}\", collection: \"${privilege.collection}\" }, actions: [\"${privilege.action}\"] }], roles: [] })" >> ~/init.js;
 %{ endfor ~}
 %{ if additional_privileges != [] ~}
                echo "db.updateUser(\"${database_user}\", { roles: [ { db: \"${database_name}\", role: \"readWrite\" },{ role: \"additionalRole\", db: \"${database_user}\" }]})" >> ~/init.js;

From 91f2e41152b057be09ebe26917cb61fc1bdf18ad Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Wed, 11 Dec 2024 17:20:14 +0530
Subject: [PATCH 20/25] id

---
 .../rdbms_provider/rds/helmcharts/dbmr/templates/mr.yaml         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gitops/applications/overlays/rdbms_provider/rds/helmcharts/dbmr/templates/mr.yaml b/gitops/applications/overlays/rdbms_provider/rds/helmcharts/dbmr/templates/mr.yaml
index 9ca802914..ca69d1c55 100644
--- a/gitops/applications/overlays/rdbms_provider/rds/helmcharts/dbmr/templates/mr.yaml
+++ b/gitops/applications/overlays/rdbms_provider/rds/helmcharts/dbmr/templates/mr.yaml
@@ -62,6 +62,7 @@ metadata:
     organization: Infitx
     author: devops   
 spec:
+  id: {{ printf "%s-%s" .Values.namePrefix  .Values.name }}
   compositionSelector:
     matchLabels:
       provider: aws

From e8961f02ec27fe6a012d33751220757eb73c89ca Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Wed, 11 Dec 2024 18:03:17 +0530
Subject: [PATCH 21/25] id

---
 .../xr-definition-rds-aurora-replica.yaml                      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gitops/applications/overlays/cloud_provider/aws/xplane-provider-config/xr-definition-rds-aurora-replica.yaml b/gitops/applications/overlays/cloud_provider/aws/xplane-provider-config/xr-definition-rds-aurora-replica.yaml
index 8526be18c..a6eb1b162 100644
--- a/gitops/applications/overlays/cloud_provider/aws/xplane-provider-config/xr-definition-rds-aurora-replica.yaml
+++ b/gitops/applications/overlays/cloud_provider/aws/xplane-provider-config/xr-definition-rds-aurora-replica.yaml
@@ -22,6 +22,9 @@ spec:
             spec:
               type: object
               properties:
+                id:
+                  type: string
+                  description: Database ID              
                 count:
                   type: integer
                   description: "The number of Aurora replicas to create."

From fe6973e44e6011c3d7c99a044f7a5f1a69e4f866 Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Thu, 12 Dec 2024 16:58:24 +0530
Subject: [PATCH 22/25] mcm chart version

---
 terraform/k8s/default-config/mojaloop-vars.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/k8s/default-config/mojaloop-vars.yaml b/terraform/k8s/default-config/mojaloop-vars.yaml
index dbd9c431d..f9afdbc11 100644
--- a/terraform/k8s/default-config/mojaloop-vars.yaml
+++ b/terraform/k8s/default-config/mojaloop-vars.yaml
@@ -1,6 +1,6 @@
 bulk_enabled: false
 third_party_enabled: false
-mcm_chart_version: 1.2.4
+mcm_chart_version: 1.2.5
 mojaloop_chart_version: 16.0.0
 currency: ${currency}
 ttk_test_currency1: ${currency}

From beae475fb86e8297fc3c9dcb2da4e9fcc62c4321 Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Thu, 12 Dec 2024 17:38:51 +0530
Subject: [PATCH 23/25] for sa creation by the chart with proper annotations

---
 .../gitops/generate-files/templates/mcm/values-mcm.yaml.tpl     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/gitops/generate-files/templates/mcm/values-mcm.yaml.tpl b/terraform/gitops/generate-files/templates/mcm/values-mcm.yaml.tpl
index afba1da6f..e44fd43dc 100644
--- a/terraform/gitops/generate-files/templates/mcm/values-mcm.yaml.tpl
+++ b/terraform/gitops/generate-files/templates/mcm/values-mcm.yaml.tpl
@@ -53,7 +53,7 @@ api:
     pkiClientRole: ${pki_client_role}
     signExpiryHours: 43800
   serviceAccount:
-    externallyManaged: true
+    externallyManaged: false
     serviceAccountNameOverride: ${mcm_service_account_name}
   rbac:
     enabled: false

From 3551d35bc044d56b797d861ab09b34397e4386e5 Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Fri, 13 Dec 2024 14:50:05 +0530
Subject: [PATCH 24/25] reverting mcm change

---
 .../gitops/generate-files/templates/mcm/values-mcm.yaml.tpl     | 2 +-
 terraform/k8s/default-config/mojaloop-vars.yaml                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/terraform/gitops/generate-files/templates/mcm/values-mcm.yaml.tpl b/terraform/gitops/generate-files/templates/mcm/values-mcm.yaml.tpl
index e44fd43dc..afba1da6f 100644
--- a/terraform/gitops/generate-files/templates/mcm/values-mcm.yaml.tpl
+++ b/terraform/gitops/generate-files/templates/mcm/values-mcm.yaml.tpl
@@ -53,7 +53,7 @@ api:
     pkiClientRole: ${pki_client_role}
     signExpiryHours: 43800
   serviceAccount:
-    externallyManaged: false
+    externallyManaged: true
     serviceAccountNameOverride: ${mcm_service_account_name}
   rbac:
     enabled: false
diff --git a/terraform/k8s/default-config/mojaloop-vars.yaml b/terraform/k8s/default-config/mojaloop-vars.yaml
index f9afdbc11..dbd9c431d 100644
--- a/terraform/k8s/default-config/mojaloop-vars.yaml
+++ b/terraform/k8s/default-config/mojaloop-vars.yaml
@@ -1,6 +1,6 @@
 bulk_enabled: false
 third_party_enabled: false
-mcm_chart_version: 1.2.5
+mcm_chart_version: 1.2.4
 mojaloop_chart_version: 16.0.0
 currency: ${currency}
 ttk_test_currency1: ${currency}

From c6cbbd342fde8100d8e5c514e11e6e85b7ac9d34 Mon Sep 17 00:00:00 2001
From: Sijo George <87609749+sijo5722-2021@users.noreply.github.com>
Date: Fri, 13 Dec 2024 18:15:17 +0530
Subject: [PATCH 25/25] rds replica 1

---
 terraform/ccnew/default-config/common-vars.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/terraform/ccnew/default-config/common-vars.yaml b/terraform/ccnew/default-config/common-vars.yaml
index 805583d7e..b9d0e1626 100644
--- a/terraform/ccnew/default-config/common-vars.yaml
+++ b/terraform/ccnew/default-config/common-vars.yaml
@@ -169,7 +169,7 @@ gitlab_postgres_rdbms_provider: "percona"
 #gitlab rds
 gitlab_rds_engine: "aurora-postgresql"
 gitlab_rds_engine_version: "'16'"
-gitlab_rds_replica_count: "'2'"
+gitlab_rds_replica_count: "'1'"
 gitlab_rds_instance_class: "db.t3.medium"
 gitlab_rds_storage_encrypted: "'true'"
 gitlab_rds_skip_final_snapshot: "'true'"
@@ -180,7 +180,7 @@ gitlab_db_storage_iops: "'5000'"
 #praefect rds
 praefect_rds_engine: "aurora-postgresql"
 praefect_rds_engine_version: "'16'"
-praefect_rds_replica_count: "'2'"
+praefect_rds_replica_count: "'1'"
 praefect_rds_instance_class: "db.t3.medium"
 praefect_rds_storage_encrypted: "'true'"
 praefect_rds_skip_final_snapshot: "'true'"
@@ -202,7 +202,7 @@ zitadel_db_storage_size: "5Gi"
 #Zitadel RDS specific
 zitadel_rds_engine: "aurora-postgresql"
 zitadel_rds_engine_version: "'16'"
-zitadel_rds_replica_count: "'2'"
+zitadel_rds_replica_count: "'1'"
 zitadel_rds_instance_class: "db.t3.medium"
 zitadel_rds_storage_encrypted: "'true'"
 zitadel_rds_skip_final_snapshot: "'true'"