New PR Feature/refactor appdeploy (#236)

* update configs for performance * update configs for performance * first draft patch kustomization * cleanup naming * add istio log config * rm values from default * app-deploy refactoring * fix: scale account lookup service * Removing unwanted variable assignements * Removing unwanted variable definition * Inclding variable finanace_portal_ingress_internal_lb in vnext * removing fin portal fqdn * Removing fin_portal assignment in vnext * Removing the var definition * Removing the var definition from mojaloop * Moving pm4ml_keycloak_realm_env_secret_map * Removing local var definition from app deploy * Removing duplicate pm4ml_var_map * Fixing variable issues * removing the first two from allowedurllist * rm interop vars not needed anymore * Removing the commented line * cleanup internal/external lb vars * rm bad merge * add mojaloop-values-override.yaml --------- Co-authored-by: Kalin Krustev <[email protected]> Co-authored-by: Sijo George <[email protected]> Co-authored-by: Sijo George <[email protected]>
mojaloop · Apr 19, 2024 · 2292755 · 2292755
1 parent 8e4997e
commit 2292755
Show file tree

Hide file tree

Showing 25 changed files with 405 additions and 485 deletions.
diff --git a/terraform/gitlab/ci-templates/k8s-cluster/.gitlab/scripts/config-merge.sh b/terraform/gitlab/ci-templates/k8s-cluster/.gitlab/scripts/config-merge.sh
@@ -1,5 +1,5 @@
 mkdir -p $CONFIG_PATH
-for configFile in {'aws-vars.yaml','cluster-config.yaml','common-vars.yaml','mojaloop-rbac-permissions.yaml','mojaloop-vars.yaml','pm4ml-vars.yaml','bare-metal-vars.yaml','pm4ml-rbac-permissions.yaml','mojaloop-stateful-resources.json','common-stateful-resources.json','mojaloop-rbac-api-resources.yaml','vnext-vars.yaml','vnext-stateful-resources.json','addons-vars.yaml'};
+for configFile in {'aws-vars.yaml','cluster-config.yaml','common-vars.yaml','mojaloop-rbac-permissions.yaml','mojaloop-vars.yaml','pm4ml-vars.yaml','bare-metal-vars.yaml','pm4ml-rbac-permissions.yaml','mojaloop-stateful-resources.json','common-stateful-resources.json','mojaloop-rbac-api-resources.yaml','vnext-vars.yaml','vnext-stateful-resources.json','addons-vars.yaml','mojaloop-values-override.yaml'};
 do
     echo $configFile
     python3 .gitlab/scripts/dictmerge.py default-config/$configFile custom-config/$configFile $CONFIG_PATH;

diff --git a/terraform/gitops/generate-files/templates/istio/istio-main/values-istio-istiod.yaml.tpl b/terraform/gitops/generate-files/templates/istio/istio-main/values-istio-istiod.yaml.tpl
@@ -309,7 +309,7 @@ global:
 
     # Per Component log level for proxy, applies to gateways and sidecars. If a component level is
     # not set, then the global "logLevel" will be used.
-    componentLogLevel: "misc:debug"
+    componentLogLevel: "misc:${istio_proxy_log_level}"
 
     # If set, newly injected sidecars will have core dumps enabled.
     enableCoreDump: false
@@ -332,7 +332,7 @@ global:
 
     # Log level for proxy, applies to gateways and sidecars.
     # Expected values are: trace|debug|info|warning|error|critical|off
-    logLevel: debug
+    logLevel: ${istio_proxy_log_level}
 
     #If set to true, istio-proxy container will have privileged securityContext
     privileged: false

diff --git a/terraform/gitops/generate-files/templates/mojaloop/kustomization.yaml.tpl b/terraform/gitops/generate-files/templates/mojaloop/kustomization.yaml.tpl
@@ -16,6 +16,7 @@ helmCharts:
   valuesFile: values-mojaloop.yaml
   namespace: ${mojaloop_namespace}
   additionalValuesFiles:
+  - values-mojaloop-override.yaml
   - values-mojaloop-addons.yaml
 - name: finance-portal
   releaseName: ${finance_portal_release_name}

diff --git a/terraform/gitops/generate-files/templates/mojaloop/values-mojaloop-override.yaml.tpl b/terraform/gitops/generate-files/templates/mojaloop/values-mojaloop-override.yaml.tpl
@@ -0,0 +1 @@
+#placeholder file for addons
diff --git a/terraform/gitops/generate-files/templates/mojaloop/values-mojaloop.yaml.tpl b/terraform/gitops/generate-files/templates/mojaloop/values-mojaloop.yaml.tpl
@@ -372,15 +372,6 @@ centralledger:
       config:
         prefix: *CL_MONITORING_PREFIX
   centralledger-handler-transfer-prepare:
-    readinessProbe:
-      initialDelaySeconds: 5
-    livenessProbe:
-      initialDelaySeconds: 10
-    sidecar:
-      readinessProbe:
-        initialDelaySeconds: 5
-      livenessProbe:
-        initialDelaySeconds: 10
 %{ if central_ledger_handler_transfer_prepare_affinity != null ~}
     affinity:
       ${indent(8, central_ledger_handler_transfer_prepare_affinity)}
@@ -411,15 +402,6 @@ centralledger:
       config:
         prefix: *CL_MONITORING_PREFIX
   centralledger-handler-transfer-position:
-    readinessProbe:
-      initialDelaySeconds: 5
-    livenessProbe:
-      initialDelaySeconds: 10
-    sidecar:
-      readinessProbe:
-        initialDelaySeconds: 5
-      livenessProbe:
-        initialDelaySeconds: 10
 %{ if central_ledger_handler_transfer_position_affinity != null ~}
     affinity:
       ${indent(8, central_ledger_handler_transfer_position_affinity)}
@@ -450,15 +432,6 @@ centralledger:
         prefix: *CL_MONITORING_PREFIX
   centralledger-handler-transfer-position-batch:
     enabled: *CL_BATCH_PROCESSING_ENABLED
-    readinessProbe:
-      initialDelaySeconds: 5
-    livenessProbe:
-      initialDelaySeconds: 10
-    sidecar:
-      readinessProbe:
-        initialDelaySeconds: 5
-      livenessProbe:
-        initialDelaySeconds: 10
 %{ if central_ledger_handler_transfer_position_batch_affinity != null ~}
     affinity:
       ${indent(8, central_ledger_handler_transfer_position_batch_affinity)}
@@ -490,15 +463,6 @@ centralledger:
       config:
         prefix: *CL_MONITORING_PREFIX
   centralledger-handler-transfer-get:
-    readinessProbe:
-      initialDelaySeconds: 5
-    livenessProbe:
-      initialDelaySeconds: 10
-    sidecar:
-      readinessProbe:
-        initialDelaySeconds: 5
-      livenessProbe:
-        initialDelaySeconds: 10
 %{ if central_ledger_handler_transfer_get_affinity != null ~}
     affinity:
       ${indent(8, central_ledger_handler_transfer_get_affinity)}
@@ -528,15 +492,6 @@ centralledger:
       config:
         prefix: *CL_MONITORING_PREFIX
   centralledger-handler-transfer-fulfil:
-    readinessProbe:
-      initialDelaySeconds: 5
-    livenessProbe:
-      initialDelaySeconds: 10
-    sidecar:
-      readinessProbe:
-        initialDelaySeconds: 5
-      livenessProbe:
-        initialDelaySeconds: 10
 %{ if central_ledger_handler_transfer_fulfil_affinity != null ~}
     affinity:
       ${indent(8, central_ledger_handler_transfer_fulfil_affinity)}
@@ -567,15 +522,6 @@ centralledger:
       config:
         prefix: *CL_MONITORING_PREFIX
   centralledger-handler-timeout:
-    readinessProbe:
-      initialDelaySeconds: 5
-    livenessProbe:
-      initialDelaySeconds: 10
-    sidecar:
-      readinessProbe:
-        initialDelaySeconds: 5
-      livenessProbe:
-        initialDelaySeconds: 10
     tolerations: *MOJALOOP_TOLERATIONS
     config:
       kafka_host: *KAFKA_HOST

diff --git a/terraform/gitops/generate-files/templates/ory/values-kratos.yaml.tpl b/terraform/gitops/generate-files/templates/ory/values-kratos.yaml.tpl
@@ -86,11 +86,8 @@ kratos:
     selfservice:
       default_browser_return_url: https://${auth_fqdn}/ui/welcome
       allowed_return_urls:
-        - https://${auth_fqdn}/ui
-        - https://${keycloak_fqdn}
-%{ for fqdnItem in bof_managed_portal_fqdns ~}
-        - https://${fqdnItem}
-%{ endfor ~}
+        - https://*.${private_subdomain}
+        - https://*.${public_subdomain}
 
       methods:
         password: