Merge pull request #1 from mojaloop/addloki

Add loki

terraform/control-center/init/control-center-env-gitlab-config/terragrunt.hcl

@@ -46,6 +46,7 @@ locals {
       domain                    = val["domain"]
       iac_terraform_modules_tag = val["iac_terraform_modules_tag"]
       enable_vault_oauth_to_gitlab = val["enable_vault_oauth_to_gitlab"]
+      enable_grafana_oauth_to_gitlab = val["enable_grafana_oauth_to_gitlab"]
       letsencrypt_email = val["letsencrypt_email"]
     }
   }

terraform/control-center/init/environment.yaml

@@ -16,8 +16,9 @@ envs:
     cloud_platform: aws
     cloud_region: eu-west-1
     k8s_cluster_type: k3s
-    iac_terraform_modules_tag: v0.9.11
+    iac_terraform_modules_tag: v0.9.12
     enable_vault_oauth_to_gitlab: true
+    enable_grafana_oauth_to_gitlab: true
     letsencrypt_email: test@mojalabs.io
 tags: {
   "Origin": "Terraform",

terraform/foundation-install/certmanager-config.tf

@@ -18,7 +18,46 @@ module "generate_certman_files" {
     cert_manager_credentials_id_provider_key     = var.gitlab_key_route53_external_dns_access_key
     cert_manager_credentials_secret_provider_key = var.gitlab_key_route53_external_dns_secret_key
     cert_manager_namespace                       = var.cert_manager_namespace
-    gitops_project_path_prefix                   = var.gitops_project_path_prefix
     gitlab_project_url                           = var.gitlab_project_url
   }
 }
+
+variable "cert_manager_chart_repo" {
+  type        = string
+  description = "cert_manager_chart_repo"
+  default     = "https://charts.jetstack.io"
+}
+variable "cert_manager_chart_version" {
+  type        = string
+  description = "1.11.0"
+}
+
+variable "cert_manager_namespace" {
+  type        = string
+  description = "cert_manager_namespace"
+  default     = "certmanager"
+}
+
+variable "cert_manager_credentials_secret" {
+  type        = string
+  description = "cert_manager_credentials_secret"
+  default     = "route53-cert-man-credentials"
+}
+
+variable "cert_manager_issuer_sync_wave" {
+  type        = string
+  description = "cert_manager_issuer_sync_wave"
+  default     = "-7"
+}
+
+variable "letsencrypt_server" {
+  type        = string
+  description = "letsencrypt_server"
+  default     = "https://acme-v02.api.letsencrypt.org/directory"
+}
+
+variable "letsencrypt_email" {
+  type        = string
+  description = "letsencrypt_email"
+  default     = "cicd@example.com"
+}

terraform/foundation-install/consul-config.tf

@@ -7,12 +7,41 @@ module "generate_consul_files" {
     storage_class_name         = var.storage_class_name
     storage_size               = var.consul_storage_size
     consul_replicas            = var.consul_replicas
-    gitops_project_path_prefix = var.gitops_project_path_prefix
     gitlab_project_url         = var.gitlab_project_url
   }
   file_list       = ["Chart.yaml", "values.yaml"]
   template_path   = "${path.module}/generate-files/templates/consul"
   output_path     = "${var.output_dir}/consul"
   app_file        = "consul-app.yaml"
   app_output_path = "${var.output_dir}/app-yamls"
-}
+}
+
+variable "consul_chart_repo" {
+  type        = string
+  description = "consul_chart_repo"
+  default     = "https://helm.releases.hashicorp.com"
+}
+
+variable "consul_chart_version" {
+  type        = string
+  description = "consul_chart_version"
+  default     = "1.0.3"
+}
+
+variable "consul_replicas" {
+  type        = string
+  description = "consul_replicas"
+  default     = "1"
+}
+
+variable "consul_storage_size" {
+  type        = string
+  description = "storage_size"
+  default     = "3Gi"
+}
+
+variable "consul_namespace" {
+  type        = string
+  description = "consul_namespace"
+  default     = "consul"
+}

terraform/foundation-install/external-dns-config.tf

@@ -11,7 +11,6 @@ module "generate_extdns_files" {
     external_dns_credentials_id_provider_key     = var.gitlab_key_route53_external_dns_access_key
     external_dns_credentials_secret_provider_key = var.gitlab_key_route53_external_dns_secret_key
     external_dns_namespace                       = var.external_dns_namespace
-    gitops_project_path_prefix                   = var.gitops_project_path_prefix
     gitlab_project_url                           = var.gitlab_project_url
     external_secret_sync_wave                    = var.external_secret_sync_wave
   }
@@ -20,4 +19,50 @@ module "generate_extdns_files" {
   output_path     = "${var.output_dir}/external-dns"
   app_file        = "external-dns-app.yaml"
   app_output_path = "${var.output_dir}/app-yamls"
+}
+
+
+variable "external_secret_sync_wave" {
+  type        = string
+  description = "external_secret_sync_wave"
+  default     = "-11"
+}
+
+variable "external_dns_credentials_secret" {
+  type        = string
+  description = "external_dns_credentials_secret"
+  default     = "route53-external-dns-credentials"
+}
+
+variable "gitlab_key_route53_external_dns_access_key" {
+  type        = string
+  description = "gitlab_key_route53_external_dns_access_key"
+}
+
+variable "gitlab_key_route53_external_dns_secret_key" {
+  type        = string
+  description = "gitlab_key_route53_external_dns_secret_key"
+}
+
+variable "external_dns_chart_repo" {
+  type        = string
+  description = "external_dns_chart_repo"
+  default     = "https://charts.bitnami.com/bitnami"
+}
+
+variable "external_dns_chart_version" {
+  type        = string
+  description = "external_dns_chart_version"
+  default     = "6.7.2"
+}
+
+variable "external_dns_namespace" {
+  type        = string
+  description = "external_dns_namespace"
+  default     = "external-dns"
+}
+
+variable "dns_cloud_region" {
+  type = string
+  description = "cloud region for ext dns"
 }