From 89b2e451e57454317b0f2bc269568a07cfb06ae6 Mon Sep 17 00:00:00 2001 From: Diego Lagos <92735530+diegolagospagopa@users.noreply.github.com> Date: Tue, 14 Nov 2023 16:12:47 +0100 Subject: [PATCH] fix: New-pvc-claim (#93) --- src/aks-platform/02_aks_storage.tf | 2 +- src/aks-platform/README.md | 2 +- .../blueprint-app/02_namespace_domain.tf | 21 +++++++++++++++++-- src/domains/blueprint-app/README.md | 3 ++- src/elk-monitoring/env/dev01/terraform.tfvars | 2 +- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/aks-platform/02_aks_storage.tf b/src/aks-platform/02_aks_storage.tf index af590349..ef5cfa4e 100644 --- a/src/aks-platform/02_aks_storage.tf +++ b/src/aks-platform/02_aks_storage.tf @@ -1,3 +1,3 @@ module "aks_storage_class" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_storage_class?ref=v7.10.0" + source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_storage_class?ref=v7.23.0" } diff --git a/src/aks-platform/README.md b/src/aks-platform/README.md index 73f90524..503efb3a 100644 --- a/src/aks-platform/README.md +++ b/src/aks-platform/README.md @@ -40,7 +40,7 @@ Re-enable all the resource, commented before to complete the procedure | [aks](#module\_aks) | git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_cluster | v7.2.0 | | [aks\_namespace\_backup](#module\_aks\_namespace\_backup) | git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_velero_backup | v7.7.0 | | [aks\_prometheus\_install](#module\_aks\_prometheus\_install) | git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_prometheus_install | v7.10.0 | -| [aks\_storage\_class](#module\_aks\_storage\_class) | git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_storage_class | v7.10.0 | +| [aks\_storage\_class](#module\_aks\_storage\_class) | git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_storage_class | v7.23.0 | | [keda\_pod\_identity](#module\_keda\_pod\_identity) | git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_pod_identity | v6.20.1 | | [nginx\_ingress](#module\_nginx\_ingress) | terraform-module/release/helm | 2.7.0 | | [snet\_aks](#module\_snet\_aks) | git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet | v6.20.1 | diff --git a/src/domains/blueprint-app/02_namespace_domain.tf b/src/domains/blueprint-app/02_namespace_domain.tf index e4b2cfef..a3725fc4 100644 --- a/src/domains/blueprint-app/02_namespace_domain.tf +++ b/src/domains/blueprint-app/02_namespace_domain.tf @@ -33,7 +33,7 @@ resource "helm_release" "reloader" { } } -resource "kubernetes_persistent_volume_claim" "blueprint_hdd" { +resource "kubernetes_persistent_volume_claim_v1" "blueprint_hdd" { metadata { name = "${var.domain}-hdd-pvc" namespace = var.domain @@ -42,9 +42,26 @@ resource "kubernetes_persistent_volume_claim" "blueprint_hdd" { access_modes = ["ReadWriteOnce"] resources { requests = { - storage = "5Gi" + storage = "4Gi" } } storage_class_name = "standard-hdd" } } + +resource "kubernetes_persistent_volume_claim_v1" "blueprint_ssd_az" { + metadata { + name = "${var.domain}-ssd-az-pvc" + namespace = var.domain + } + spec { + access_modes = ["ReadWriteOnce"] + resources { + requests = { + storage = "8Gi" + } + } + storage_class_name = "managed-csi-premium-zrs" + } + wait_until_bound = false +} diff --git a/src/domains/blueprint-app/README.md b/src/domains/blueprint-app/README.md index cf37ccdf..df211cd3 100644 --- a/src/domains/blueprint-app/README.md +++ b/src/domains/blueprint-app/README.md @@ -31,7 +31,8 @@ | [helm_release.reloader](https://registry.terraform.io/providers/hashicorp/helm/2.7.1/docs/resources/release) | resource | | [kubernetes_namespace.domain_namespace](https://registry.terraform.io/providers/hashicorp/kubernetes/2.23.0/docs/resources/namespace) | resource | | [kubernetes_namespace.system_domain_namespace](https://registry.terraform.io/providers/hashicorp/kubernetes/2.23.0/docs/resources/namespace) | resource | -| [kubernetes_persistent_volume_claim.blueprint_hdd](https://registry.terraform.io/providers/hashicorp/kubernetes/2.23.0/docs/resources/persistent_volume_claim) | resource | +| [kubernetes_persistent_volume_claim_v1.blueprint_hdd](https://registry.terraform.io/providers/hashicorp/kubernetes/2.23.0/docs/resources/persistent_volume_claim_v1) | resource | +| [kubernetes_persistent_volume_claim_v1.blueprint_ssd_az](https://registry.terraform.io/providers/hashicorp/kubernetes/2.23.0/docs/resources/persistent_volume_claim_v1) | resource | | [kubernetes_role_binding.deployer_binding](https://registry.terraform.io/providers/hashicorp/kubernetes/2.23.0/docs/resources/role_binding) | resource | | [kubernetes_role_binding.system_deployer_binding](https://registry.terraform.io/providers/hashicorp/kubernetes/2.23.0/docs/resources/role_binding) | resource | | [kubernetes_secret_v1.azure_devops_service_account_default_secret](https://registry.terraform.io/providers/hashicorp/kubernetes/2.23.0/docs/resources/secret_v1) | resource | diff --git a/src/elk-monitoring/env/dev01/terraform.tfvars b/src/elk-monitoring/env/dev01/terraform.tfvars index eae91045..cdba8c89 100644 --- a/src/elk-monitoring/env/dev01/terraform.tfvars +++ b/src/elk-monitoring/env/dev01/terraform.tfvars @@ -73,7 +73,7 @@ elk_spot_user_node_pool = { os_disk_size_gb = 300, node_count_min = 1, node_count_max = 1, - node_labels = { elastic : "eck", node_type : "user" }, + node_labels = { elastic : "eck" }, node_taints = [], node_tags = { node_tag_2 : "2" }, }