feat(azure): add module

camptocamp · Apr 12, 2022 · c6f4784 · c6f4784
1 parent 55681a6
commit c6f4784
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 42 deletions.
diff --git a/aks/extra-variables.tf b/aks/extra-variables.tf
@@ -6,7 +6,7 @@ variable "storage_account_tier" {
 
 variable "storage_account_replication_type" {
   description = "Storage account replication type for storing loki logs"
-  default     = "GRS"
+  default     = "LRS"
   type        = string
 }
 

diff --git a/aks/local.tf b/aks/local.tf
@@ -0,0 +1,36 @@
+locals {
+    helm_values = [{
+        loki-stack = {
+            loki = {
+                config = {
+                    schema_config = {
+                        configs = [
+                            {
+                                from = "2020-12-22"
+                                store = "boltdb-shipper"
+                                object_store = "azure"
+                                schema = "v11"
+                                index = {
+                                    prefix = "index_"
+                                    period = "24h"
+                                }
+                            },
+                        ]
+                    }
+                    storage_config = {
+                        azure = {
+                            container_name = "${azurerm_storage_container.loki.name}"
+                            account_name = "${azurerm_storage_account.this.name}"
+                            account_key = "${azurerm_storage_account.this.primary_access_key}"
+                        }
+                        boltdb_shipper = {
+                            active_index_directory = "/data/loki/index"
+                            shared_store = "azure"
+                            cache_location = "/data/loki/boltdb-cache"
+                        }
+                    }
+                }
+            }
+        }
+    }]
+}
diff --git a/aks/main.tf b/aks/main.tf
@@ -32,12 +32,7 @@ module "loki-stack" {
   cluster_name     = var.cluster_name
   base_domain      = var.base_domain
   argocd_namespace = var.argocd_namespace
-
   namespace = var.namespace
 
-  extra_yaml = concat([templatefile("${path.module}/values.tmpl.yaml", {
-    loki_container_name = azurerm_storage_container.loki.name,
-    loki_account_name   = azurerm_storage_account.this.name,
-    loki_account_key    = azurerm_storage_account.this.primary_access_key,
-  })], var.extra_yaml)
+  helm_values = concat(local.helm_values, var.helm_values)
 }
diff --git a/aks/values.tmpl.yaml b/aks/values.tmpl.yaml
diff --git a/local.tf b/local.tf
@@ -1,5 +1,3 @@
 locals {
-  default_yaml = [templatefile("${path.module}/values.tmpl.yaml", {
-  })]
-  all_yaml = concat(local.default_yaml, var.extra_yaml)
+  helm_values = [{}]
 }
diff --git a/main.tf b/main.tf
@@ -28,7 +28,7 @@ resource "argocd_project" "this" {
 }
 
 data "utils_deep_merge_yaml" "values" {
-  input = local.all_yaml
+  input = [for i in concat(local.helm_values, var.helm_values) : yamlencode(i)]
 }
 
 resource "argocd_application" "this" {
@@ -56,8 +56,17 @@ resource "argocd_application" "this" {
 
     sync_policy {
       automated = {
-        prune     = true
-        self_heal = true
+        allow_empty = false
+        prune       = true
+        self_heal   = true
+      }
+
+      retry {
+        backoff = {
+          duration     = ""
+          max_duration = ""
+        }
+        limit = "0"
       }
 
       sync_options = [

diff --git a/outputs.tf b/outputs.tf
diff --git a/values.tmpl.yaml b/values.tmpl.yaml
diff --git a/variables.tf b/variables.tf
@@ -19,9 +19,10 @@ variable "namespace" {
   default = "loki-stack"
 }
 
-variable "extra_yaml" {
-  type    = list(string)
-  default = []
+variable "helm_values" {
+  description = "Helm values, passed as a list of HCL structures."
+  type        = any
+  default     = []
 }
 
 #######################