feat(aks): enable parametrization of storage account used by loki (ca…

…mptocamp#835)
omohammed95 · Dec 14, 2021 · 0be4796 · 0be4796
1 parent bffcc9b
commit 0be4796
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/modules/aks/azure/main.tf b/modules/aks/azure/main.tf
@@ -198,8 +198,8 @@ resource "azurerm_storage_account" "this" {
   name                     = random_string.storage_account.result
   resource_group_name      = module.cluster.node_resource_group
   location                 = data.azurerm_resource_group.this.location
-  account_tier             = "Standard"
-  account_replication_type = "GRS"
+  account_tier             = var.storage_account_tier
+  account_replication_type = var.storage_account_replication_type
 }
 
 resource "azurerm_storage_container" "loki" {
@@ -240,7 +240,7 @@ data "azurerm_client_config" "current" {}
 resource "azuread_application" "oauth2_apps" {
   count = var.oidc == null ? 1 : 0
 
-  display_name     = "oauth2-apps-${var.cluster_name}"
+  display_name = "oauth2-apps-${var.cluster_name}"
 
   required_resource_access {
     resource_app_id = random_uuid.resource_app_id.0.result

diff --git a/modules/aks/azure/variables.tf b/modules/aks/azure/variables.tf
@@ -75,3 +75,15 @@ variable "node_pools" {
   description = "List of node pools with minimal configuration"
   type        = map(any)
 }
+
+variable "storage_account_tier" {
+  description = "Storage account tier used for storing loki logs"
+  default     = "Standard"
+  type        = string
+}
+
+variable "storage_account_replication_type" {
+  description = "Storage account replication type for storing loki logs"
+  default     = "GRS"
+  type        = string
+}
diff --git a/modules/cce/opentelekomcloud/variables.tf b/modules/cce/opentelekomcloud/variables.tf
@@ -40,4 +40,3 @@ variable "keycloak_users" {
   type        = map(map(string))
   default = {}
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -40,4 +40,3 @@ variable "keycloak_users" {
		type = map(map(string))
		default = {}
		}