From e74f63b74e8c82c1992d664fa3c6564befd66ce3 Mon Sep 17 00:00:00 2001 From: Emanuel Quiroga Date: Tue, 10 May 2022 18:55:54 -0300 Subject: [PATCH] - replacing ram inputs name for memory instead - Adding further information in README --- README.md | 76 +++++++++++++++++++--------------- helm.tf | 112 +++++++++++++++++++++++++-------------------------- variables.tf | 56 +++++++++++++------------- 3 files changed, 128 insertions(+), 116 deletions(-) diff --git a/README.md b/README.md index 03a04b1..06dcecc 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,23 @@ Terraform module which creates EKS Cluster and dependent resources on AWS. +## Notice +#### This module install several Helm charts with limited inputs for their configuration, in order to keep it easy and simple. For a more accurate configuration we recommend to read their documentation and make your own installation of your desired Helm charts: +- [Metrics Server Helm chart](https://github.com/bitnami/charts/tree/master/bitnami/metrics-server/#installing-the-chart) +- [Ingress NGINX Helm Chart](https://github.com/kubernetes/ingress-nginx/tree/main/charts/ingress-nginx) +- [Cluster Autoscaler Helm Chart](https://github.com/kubernetes/autoscaler/tree/master/charts/cluster-autoscaler) +- [Cert Manager Helm Chart](https://github.com/cert-manager/cert-manager/tree/master/deploy/charts/cert-manager) +- [Kube Prometheus Stack Helm Chart](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack) +- [Loki Distributed Helm Chart](https://github.com/grafana/helm-charts/tree/main/charts/loki-distributed) +- [Fluent Bit Helm Chart](https://github.com/fluent/helm-charts/tree/main/charts/fluent-bit) +- [Tempo Distributed Helm Chart](https://github.com/grafana/helm-charts/tree/main/charts/tempo-distributed) + + ## Usage -### Terraform required version >= 0.14.8 +#### Terraform required version >= 0.14.8 -### Elastic Kubernetes Service +## Elastic Kubernetes Service EKS Cluster with ELB: @@ -98,9 +110,9 @@ module "eks_main" { prometheus_ingress_enabled = true prometheus_ingress_host = "prometheus.example.com" prometheus_requests_cpu = "200m" - prometheus_requests_ram = "1024Mi" + prometheus_requests_memory = "1024Mi" prometheus_limits_cpu = "500m" - prometheus_limits_ram = "2048Mi" + prometheus_limits_memory = "2048Mi" # ================== tempo ================== # helm_tempo_enabled = true @@ -157,27 +169,27 @@ module "eks_main" { | loki\_ingester\_storage\_class | storageClass for ingesters pv | `string` | `gp2` | no | | loki\_ingester\_storage\_size | size of ingesters pv | `string` | `10Gi` | no | | loki\_ingester\_requests\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| loki\_ingester\_requests\_ram | resources config for kubernetes pod | `string` | `null` | no | +| loki\_ingester\_requests\_memory | resources config for kubernetes pod | `string` | `null` | no | | loki\_ingester\_limits\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| loki\_ingester\_limits\_ram | resources config for kubernetes pod | `string` | `null` | no | +| loki\_ingester\_limits\_memory | resources config for kubernetes pod | `string` | `null` | no | | loki\_distributor\_min\_replicas | loki distributor hpa min replicas | `int` | `1` | no | | loki\_distributor\_requests\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| loki\_distributor\_requests\_ram | resources config for kubernetes pod | `string` | `null` | no | +| loki\_distributor\_requests\_memory | resources config for kubernetes pod | `string` | `null` | no | | loki\_distributor\_limits\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| loki\_distributor\_limits\_ram | resources config for kubernetes pod | `string` | `null` | no | +| loki\_distributor\_limits\_memory | resources config for kubernetes pod | `string` | `null` | no | | loki\_distributor\_max\_replicas | loki distributor hpa max replicas | `int` | `1` | no | | loki\_querier\_min\_replicas | loki querier hpa min replicas | `int` | `1` | no | | loki\_querier\_max\_replicas | loki querier hpa max replicas | `int` | `1` | no | | loki\_querier\_requests\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| loki\_querier\_requests\_ram | resources config for kubernetes pod | `string` | `null` | no | +| loki\_querier\_requests\_memory | resources config for kubernetes pod | `string` | `null` | no | | loki\_querier\_limits\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| loki\_querier\_limits\_ram | resources config for kubernetes pod | `string` | `null` | no | +| loki\_querier\_limits\_memory | resources config for kubernetes pod | `string` | `null` | no | | loki\_query\_frontend\_min\_replicas | loki query-frontend hpa min replicas | `int` | `1` | no | | loki\_query\_frontend\_max\_replicas | loki query-frontend hpa max replicas | `int` | `1` | no | | loki\_query\_frontend\_requests\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| loki\_query\_frontend\_requests\_ram | resources config for kubernetes pod | `string` | `null` | no | +| loki\_query\_frontend\_requests\_memory | resources config for kubernetes pod | `string` | `null` | no | | loki\_query\_frontend\_limits\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| loki\_query\_frontend\_limits\_ram | resources config for kubernetes pod | `string` | `null` | no | +| loki\_query\_frontend\_limits\_memory | resources config for kubernetes pod | `string` | `null` | no | | loki\_gateway\_enabled | Enable loki gateway | `bool` | `false` | no | | loki\_gateway\_min\_replicas | loki gateway hpa min replicas | `int` | `1` | no | | loki\_gateway\_max\_replicas | loki gateway hpa max replicas | `int` | `1` | no | @@ -187,30 +199,30 @@ module "eks_main" { | loki\_gateway\_ingress\_path\_type | Path type for ingress rule | `string` | `Prefix` | no | | loki\_gateway\_ingress\_class\_name | Set ingress class name | `string` | `nginx` | no | | loki\_gateway\_requests\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| loki\_gateway\_requests\_ram | resources config for kubernetes pod | `string` | `null` | no | +| loki\_gateway\_requests\_memory | resources config for kubernetes pod | `string` | `null` | no | | loki\_gateway\_limits\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| loki\_gateway\_limits\_ram | resources config for kubernetes pod | `string` | `null` | no | +| loki\_gateway\_limits\_memory | resources config for kubernetes pod | `string` | `null` | no | | loki\_compactor\_enabled | Enable loki compactor | `bool` | `false` | no | | loki\_compactor\_requests\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| loki\_compactor\_requests\_ram | resources config for kubernetes pod | `string` | `null` | no | +| loki\_compactor\_requests\_memory | resources config for kubernetes pod | `string` | `null` | no | | loki\_compactor\_limits\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| loki\_compactor\_limits\_ram | resources config for kubernetes pod | `string` | `null` | no | +| loki\_compactor\_limits\_memory | resources config for kubernetes pod | `string` | `null` | no | | loki\_index\_gateway\_enabled | Enable loki index gateway | `bool` | `false` | no | | loki\_index\_gateway\_replicas | Set loki index gateway replicas | `int` | `1` | no | | loki\_index\_gateway\_storage\_class | storageClass for index gateway pv | `string` | `gp2` | no | | loki\_index\_gateway\_storage\_size | storage size for index gateway pv | `string` | `10Gi` | no | | loki\_index\_gateway\_requests\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| loki\_index\_gateway\_requests\_ram | resources config for kubernetes pod | `string` | `null` | no | +| loki\_index\_gateway\_requests\_memory | resources config for kubernetes pod | `string` | `null` | no | | loki\_index\_gateway\_limits\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| loki\_index\_gateway\_limits\_ram | resources config for kubernetes pod | `string` | `null` | no | +| loki\_index\_gateway\_limits\_memory | resources config for kubernetes pod | `string` | `null` | no | | helm\_fluent\_bit\_enabled | install fluent-bit helm chart | `bool` | `false` | no | | k8s\_opentelemetry\_enabled | install opentelemetry manifests | `bool` | `false` | no | | helm\_prometheus\_enabled | install kube-prometheus-stack helm chart | `bool` | `false` | no | | prometheus\_replicas | prometheus server replicas | `int` | `1` | no | | prometheus\_requests\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| prometheus\_requests\_ram | resources config for kubernetes pod | `string` | `null` | no | +| prometheus\_requests\_memory | resources config for kubernetes pod | `string` | `null` | no | | prometheus\_limits\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| prometheus\_limits\_ram | resources config for kubernetes pod | `string` | `null` | no | +| prometheus\_limits\_memory | resources config for kubernetes pod | `string` | `null` | no | | prometheus\_ingress\_enabled | Enable ingress for prometheus server | `bool` | `false` | no | | prometheus\_ingress\_host | Host for ingress rule | `string` | `""` | no | | prometheus\_ingress\_path | Path for ingress rule | `string` | `/` | no | @@ -221,32 +233,32 @@ module "eks_main" { | prometheus\_metrics\_retention | Prometheus metrics period retention | `string` | `14d` | no | | helm\_tempo\_enabled | Install tempo-distributed helm chart | `bool` | `false` | no | | tempo\_compactor\_requests\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| tempo\_compactor\_requests\_ram | resources config for kubernetes pod | `string` | `null` | no | +| tempo\_compactor\_requests\_memory | resources config for kubernetes pod | `string` | `null` | no | | tempo\_compactor\_limits\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| tempo\_compactor\_limits\_ram | resources config for kubernetes pod | `string` | `null` | no | +| tempo\_compactor\_limits\_memory | resources config for kubernetes pod | `string` | `null` | no | | tempo\_distributor\_requests\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| tempo\_distributor\_requests\_ram | resources config for kubernetes pod | `string` | `null` | no | +| tempo\_distributor\_requests\_memory | resources config for kubernetes pod | `string` | `null` | no | | tempo\_distributor\_limits\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| tempo\_distributor\_limits\_ram | resources config for kubernetes pod | `string` | `null` | no | +| tempo\_distributor\_limits\_memory | resources config for kubernetes pod | `string` | `null` | no | | tempo\_storage\_s3\_bucket | s3 bucket for tempo traces | `string` | `""` | no | | tempo\_s3\_bucket\_region | s3 bucket regino for tempo traces | `string` | `""` | no | | tempo\_ingester\_requests\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| tempo\_ingester\_requests\_ram | resources config for kubernetes pod | `string` | `null` | no | +| tempo\_ingester\_requests\_memory | resources config for kubernetes pod | `string` | `null` | no | | tempo\_ingester\_limits\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| tempo\_ingester\_limits\_ram | resources config for kubernetes pod | `string` | `null` | no | +| tempo\_ingester\_limits\_memory | resources config for kubernetes pod | `string` | `null` | no | | tempo\_querier\_requests\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| tempo\_querier\_requests\_ram | resources config for kubernetes pod | `string` | `null` | no | +| tempo\_querier\_requests\_memory | resources config for kubernetes pod | `string` | `null` | no | | tempo\_querier\_limits\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| tempo\_querier\_limits\_ram | resources config for kubernetes pod | `string` | `null` | no | +| tempo\_querier\_limits\_memory | resources config for kubernetes pod | `string` | `null` | no | | tempo\_query\_frontend\_requests\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| tempo\_query\_frontend\_requests\_ram | resources config for kubernetes pod | `string` | `null` | no | +| tempo\_query\_frontend\_requests\_memory | resources config for kubernetes pod | `string` | `null` | no | | tempo\_query\_frontend\_limits\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| tempo\_query\_frontend\_limits\_ram | resources config for kubernetes pod | `string` | `null` | no | +| tempo\_query\_frontend\_limits\_memory | resources config for kubernetes pod | `string` | `null` | no | | tempo\_gateway\_enabled | enable tempo gateway | `bool` | `false` | no | | tempo\_gateway\_requests\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| tempo\_gateway\_requests\_ram | resources config for kubernetes pod | `string` | `null` | no | +| tempo\_gateway\_requests\_memory | resources config for kubernetes pod | `string` | `null` | no | | tempo\_gateway\_limits\_cpu | resources config for kubernetes pod | `string` | `null` | no | -| tempo\_gateway\_limits\_ram | resources config for kubernetes pod | `string` | `null` | no | +| tempo\_gateway\_limits\_memory | resources config for kubernetes pod | `string` | `null` | no | | tempo\_gateway\_ingress\_enabled | Enable ingress for tempo gateway | `bool` | `false` | no | | tempo\_gateway\_ingress\_host | Host for ingress rule | `string` | `""` | no | | tempo\_gateway\_ingress\_path | Path for ingress rule | `string` | `/` | no | diff --git a/helm.tf b/helm.tf index 3f5a88a..df2caa0 100644 --- a/helm.tf +++ b/helm.tf @@ -131,10 +131,10 @@ resource "helm_release" "prometheus_stack" { } dynamic "set" { - for_each = var.prometheus_requests_ram != null ? ["do it"] : [] + for_each = var.prometheus_requests_memory != null ? ["do it"] : [] content { name = "prometheus.prometheusSpec.resources.requests.memory" - value = var.prometheus_requests_ram + value = var.prometheus_requests_memory } } @@ -147,10 +147,10 @@ resource "helm_release" "prometheus_stack" { } dynamic "set" { - for_each = var.prometheus_limits_ram != null ? ["do it"] : [] + for_each = var.prometheus_limits_memory != null ? ["do it"] : [] content { name = "prometheus.prometheusSpec.resources.limits.memory" - value = var.prometheus_limits_ram + value = var.prometheus_limits_memory } } @@ -270,10 +270,10 @@ resource "helm_release" "loki_distributed" { } dynamic "set" { - for_each = var.loki_ingester_requests_ram != null ? ["do it"] : [] + for_each = var.loki_ingester_requests_memory != null ? ["do it"] : [] content { name = "ingester.resources.requests.memory" - value = var.loki_ingester_requests_ram + value = var.loki_ingester_requests_memory } } @@ -286,10 +286,10 @@ resource "helm_release" "loki_distributed" { } dynamic "set" { - for_each = var.loki_ingester_limits_ram != null ? ["do it"] : [] + for_each = var.loki_ingester_limits_memory != null ? ["do it"] : [] content { name = "ingester.resources.limits.memory" - value = var.loki_ingester_limits_ram + value = var.loki_ingester_limits_memory } } @@ -320,10 +320,10 @@ resource "helm_release" "loki_distributed" { } dynamic "set" { - for_each = var.loki_distributor_requests_ram != null ? ["do it"] : [] + for_each = var.loki_distributor_requests_memory != null ? ["do it"] : [] content { name = "distributor.resources.requests.memory" - value = var.loki_distributor_requests_ram + value = var.loki_distributor_requests_memory } } @@ -336,10 +336,10 @@ resource "helm_release" "loki_distributed" { } dynamic "set" { - for_each = var.loki_distributor_limits_ram != null ? ["do it"] : [] + for_each = var.loki_distributor_limits_memory != null ? ["do it"] : [] content { name = "distributor.resources.limits.memory" - value = var.loki_distributor_limits_ram + value = var.loki_distributor_limits_memory } } @@ -369,10 +369,10 @@ resource "helm_release" "loki_distributed" { } dynamic "set" { - for_each = var.loki_querier_requests_ram != null ? ["do it"] : [] + for_each = var.loki_querier_requests_memory != null ? ["do it"] : [] content { name = "querier.resources.requests.memory" - value = var.loki_querier_requests_ram + value = var.loki_querier_requests_memory } } @@ -385,10 +385,10 @@ resource "helm_release" "loki_distributed" { } dynamic "set" { - for_each = var.loki_querier_limits_ram != null ? ["do it"] : [] + for_each = var.loki_querier_limits_memory != null ? ["do it"] : [] content { name = "querier.resources.limits.memory" - value = var.loki_querier_limits_ram + value = var.loki_querier_limits_memory } } @@ -418,10 +418,10 @@ resource "helm_release" "loki_distributed" { } dynamic "set" { - for_each = var.loki_query_frontend_requests_ram != null ? ["do it"] : [] + for_each = var.loki_query_frontend_requests_memory != null ? ["do it"] : [] content { name = "queryFrontend.resources.requests.memory" - value = var.loki_query_frontend_requests_ram + value = var.loki_query_frontend_requests_memory } } @@ -434,10 +434,10 @@ resource "helm_release" "loki_distributed" { } dynamic "set" { - for_each = var.loki_query_frontend_limits_ram != null ? ["do it"] : [] + for_each = var.loki_query_frontend_limits_memory != null ? ["do it"] : [] content { name = "queryFrontend.resources.limits.memory" - value = var.loki_query_frontend_limits_ram + value = var.loki_query_frontend_limits_memory } } @@ -457,10 +457,10 @@ resource "helm_release" "loki_distributed" { } dynamic "set" { - for_each = var.loki_compactor_requests_ram != null ? ["do it"] : [] + for_each = var.loki_compactor_requests_memory != null ? ["do it"] : [] content { name = "compactor.resources.requests.memory" - value = var.loki_compactor_requests_ram + value = var.loki_compactor_requests_memory } } @@ -473,10 +473,10 @@ resource "helm_release" "loki_distributed" { } dynamic "set" { - for_each = var.loki_compactor_limits_ram != null ? ["do it"] : [] + for_each = var.loki_compactor_limits_memory != null ? ["do it"] : [] content { name = "compactor.resources.limits.memory" - value = var.loki_compactor_limits_ram + value = var.loki_compactor_limits_memory } } @@ -517,10 +517,10 @@ resource "helm_release" "loki_distributed" { } dynamic "set" { - for_each = var.loki_index_gateway_requests_ram != null ? ["do it"] : [] + for_each = var.loki_index_gateway_requests_memory != null ? ["do it"] : [] content { name = "indexGateway.resources.requests.memory" - value = var.loki_index_gateway_requests_ram + value = var.loki_index_gateway_requests_memory } } @@ -533,10 +533,10 @@ resource "helm_release" "loki_distributed" { } dynamic "set" { - for_each = var.loki_index_gateway_limits_ram != null ? ["do it"] : [] + for_each = var.loki_index_gateway_limits_memory != null ? ["do it"] : [] content { name = "indexGateway.resources.limits.memory" - value = var.loki_index_gateway_limits_ram + value = var.loki_index_gateway_limits_memory } } @@ -571,10 +571,10 @@ resource "helm_release" "loki_distributed" { } dynamic "set" { - for_each = var.loki_gateway_requests_ram != null ? ["do it"] : [] + for_each = var.loki_gateway_requests_memory != null ? ["do it"] : [] content { name = "gateway.resources.requests.memory" - value = var.loki_gateway_requests_ram + value = var.loki_gateway_requests_memory } } @@ -587,10 +587,10 @@ resource "helm_release" "loki_distributed" { } dynamic "set" { - for_each = var.loki_gateway_limits_ram != null ? ["do it"] : [] + for_each = var.loki_gateway_limits_memory != null ? ["do it"] : [] content { name = "gateway.resources.limits.memory" - value = var.loki_gateway_limits_ram + value = var.loki_gateway_limits_memory } } @@ -715,10 +715,10 @@ resource "helm_release" "tempo_distributed" { } dynamic "set" { - for_each = var.tempo_gateway_requests_ram != null ? ["do it"] : [] + for_each = var.tempo_gateway_requests_memory != null ? ["do it"] : [] content { name = "gateway.resources.requests.memory" - value = var.tempo_gateway_requests_ram + value = var.tempo_gateway_requests_memory } } @@ -731,10 +731,10 @@ resource "helm_release" "tempo_distributed" { } dynamic "set" { - for_each = var.tempo_gateway_limits_ram != null ? ["do it"] : [] + for_each = var.tempo_gateway_limits_memory != null ? ["do it"] : [] content { name = "gateway.resources.limits.memory" - value = var.tempo_gateway_limits_ram + value = var.tempo_gateway_limits_memory } } @@ -749,10 +749,10 @@ resource "helm_release" "tempo_distributed" { } dynamic "set" { - for_each = var.tempo_compactor_requests_ram != null ? ["do it"] : [] + for_each = var.tempo_compactor_requests_memory != null ? ["do it"] : [] content { name = "compactor.resources.requests.memory" - value = var.tempo_compactor_requests_ram + value = var.tempo_compactor_requests_memory } } @@ -765,10 +765,10 @@ resource "helm_release" "tempo_distributed" { } dynamic "set" { - for_each = var.tempo_compactor_limits_ram != null ? ["do it"] : [] + for_each = var.tempo_compactor_limits_memory != null ? ["do it"] : [] content { name = "compactor.resources.limits.memory" - value = var.tempo_compactor_limits_ram + value = var.tempo_compactor_limits_memory } } @@ -783,10 +783,10 @@ resource "helm_release" "tempo_distributed" { } dynamic "set" { - for_each = var.tempo_distributor_requests_ram != null ? ["do it"] : [] + for_each = var.tempo_distributor_requests_memory != null ? ["do it"] : [] content { name = "distributor.resources.requests.memory" - value = var.tempo_distributor_requests_ram + value = var.tempo_distributor_requests_memory } } @@ -799,10 +799,10 @@ resource "helm_release" "tempo_distributed" { } dynamic "set" { - for_each = var.tempo_distributor_limits_ram != null ? ["do it"] : [] + for_each = var.tempo_distributor_limits_memory != null ? ["do it"] : [] content { name = "distributor.resources.limits.memory" - value = var.tempo_distributor_limits_ram + value = var.tempo_distributor_limits_memory } } @@ -817,10 +817,10 @@ resource "helm_release" "tempo_distributed" { } dynamic "set" { - for_each = var.tempo_ingester_requests_ram != null ? ["do it"] : [] + for_each = var.tempo_ingester_requests_memory != null ? ["do it"] : [] content { name = "ingester.resources.requests.memory" - value = var.tempo_ingester_requests_ram + value = var.tempo_ingester_requests_memory } } @@ -833,10 +833,10 @@ resource "helm_release" "tempo_distributed" { } dynamic "set" { - for_each = var.tempo_ingester_limits_ram != null ? ["do it"] : [] + for_each = var.tempo_ingester_limits_memory != null ? ["do it"] : [] content { name = "ingester.resources.limits.memory" - value = var.tempo_ingester_limits_ram + value = var.tempo_ingester_limits_memory } } @@ -851,10 +851,10 @@ resource "helm_release" "tempo_distributed" { } dynamic "set" { - for_each = var.tempo_querier_requests_ram != null ? ["do it"] : [] + for_each = var.tempo_querier_requests_memory != null ? ["do it"] : [] content { name = "querier.resources.requests.memory" - value = var.tempo_querier_requests_ram + value = var.tempo_querier_requests_memory } } @@ -867,10 +867,10 @@ resource "helm_release" "tempo_distributed" { } dynamic "set" { - for_each = var.tempo_querier_limits_ram != null ? ["do it"] : [] + for_each = var.tempo_querier_limits_memory != null ? ["do it"] : [] content { name = "querier.resources.limits.memory" - value = var.tempo_querier_limits_ram + value = var.tempo_querier_limits_memory } } @@ -885,10 +885,10 @@ resource "helm_release" "tempo_distributed" { } dynamic "set" { - for_each = var.tempo_query_frontend_requests_ram != null ? ["do it"] : [] + for_each = var.tempo_query_frontend_requests_memory != null ? ["do it"] : [] content { name = "queryFrontend.resources.requests.memory" - value = var.tempo_query_frontend_requests_ram + value = var.tempo_query_frontend_requests_memory } } @@ -901,10 +901,10 @@ resource "helm_release" "tempo_distributed" { } dynamic "set" { - for_each = var.tempo_query_frontend_limits_ram != null ? ["do it"] : [] + for_each = var.tempo_query_frontend_limits_memory != null ? ["do it"] : [] content { name = "queryFrontend.resources.limits.memory" - value = var.tempo_query_frontend_limits_ram + value = var.tempo_query_frontend_limits_memory } } diff --git a/variables.tf b/variables.tf index 3faa875..afda141 100644 --- a/variables.tf +++ b/variables.tf @@ -117,13 +117,13 @@ variable "loki_ingester_storage_size" { variable "loki_ingester_requests_cpu" { default = null } -variable "loki_ingester_requests_ram" { +variable "loki_ingester_requests_memory" { default = null } variable "loki_ingester_limits_cpu" { default = null } -variable "loki_ingester_limits_ram" { +variable "loki_ingester_limits_memory" { default = null } @@ -135,13 +135,13 @@ variable "loki_distributor_min_replicas" { variable "loki_distributor_requests_cpu" { default = null } -variable "loki_distributor_requests_ram" { +variable "loki_distributor_requests_memory" { default = null } variable "loki_distributor_limits_cpu" { default = null } -variable "loki_distributor_limits_ram" { +variable "loki_distributor_limits_memory" { default = null } @@ -161,13 +161,13 @@ variable "loki_querier_max_replicas" { variable "loki_querier_requests_cpu" { default = null } -variable "loki_querier_requests_ram" { +variable "loki_querier_requests_memory" { default = null } variable "loki_querier_limits_cpu" { default = null } -variable "loki_querier_limits_ram" { +variable "loki_querier_limits_memory" { default = null } @@ -183,13 +183,13 @@ variable "loki_query_frontend_max_replicas" { variable "loki_query_frontend_requests_cpu" { default = null } -variable "loki_query_frontend_requests_ram" { +variable "loki_query_frontend_requests_memory" { default = null } variable "loki_query_frontend_limits_cpu" { default = null } -variable "loki_query_frontend_limits_ram" { +variable "loki_query_frontend_limits_memory" { default = null } @@ -230,13 +230,13 @@ variable "loki_gateway_ingress_class_name" { variable "loki_gateway_requests_cpu" { default = null } -variable "loki_gateway_requests_ram" { +variable "loki_gateway_requests_memory" { default = null } variable "loki_gateway_limits_cpu" { default = null } -variable "loki_gateway_limits_ram" { +variable "loki_gateway_limits_memory" { default = null } @@ -249,13 +249,13 @@ variable "loki_compactor_enabled" { variable "loki_compactor_requests_cpu" { default = null } -variable "loki_compactor_requests_ram" { +variable "loki_compactor_requests_memory" { default = null } variable "loki_compactor_limits_cpu" { default = null } -variable "loki_compactor_limits_ram" { +variable "loki_compactor_limits_memory" { default = null } @@ -280,13 +280,13 @@ variable "loki_index_gateway_storage_size" { variable "loki_index_gateway_requests_cpu" { default = null } -variable "loki_index_gateway_requests_ram" { +variable "loki_index_gateway_requests_memory" { default = null } variable "loki_index_gateway_limits_cpu" { default = null } -variable "loki_index_gateway_limits_ram" { +variable "loki_index_gateway_limits_memory" { default = null } @@ -309,7 +309,7 @@ variable "prometheus_requests_cpu" { default = null } -variable "prometheus_requests_ram" { +variable "prometheus_requests_memory" { default = null } @@ -317,7 +317,7 @@ variable "prometheus_limits_cpu" { default = null } -variable "prometheus_limits_ram" { +variable "prometheus_limits_memory" { default = null } @@ -364,7 +364,7 @@ variable "tempo_compactor_requests_cpu" { default = null } -variable "tempo_compactor_requests_ram" { +variable "tempo_compactor_requests_memory" { default = null } @@ -372,7 +372,7 @@ variable "tempo_compactor_limits_cpu" { default = null } -variable "tempo_compactor_limits_ram" { +variable "tempo_compactor_limits_memory" { default = null } @@ -381,7 +381,7 @@ variable "tempo_distributor_requests_cpu" { default = null } -variable "tempo_distributor_requests_ram" { +variable "tempo_distributor_requests_memory" { default = null } @@ -389,7 +389,7 @@ variable "tempo_distributor_limits_cpu" { default = null } -variable "tempo_distributor_limits_ram" { +variable "tempo_distributor_limits_memory" { default = null } @@ -407,7 +407,7 @@ variable "tempo_ingester_requests_cpu" { default = null } -variable "tempo_ingester_requests_ram" { +variable "tempo_ingester_requests_memory" { default = null } @@ -415,7 +415,7 @@ variable "tempo_ingester_limits_cpu" { default = null } -variable "tempo_ingester_limits_ram" { +variable "tempo_ingester_limits_memory" { default = null } @@ -424,7 +424,7 @@ variable "tempo_querier_requests_cpu" { default = null } -variable "tempo_querier_requests_ram" { +variable "tempo_querier_requests_memory" { default = null } @@ -432,7 +432,7 @@ variable "tempo_querier_limits_cpu" { default = null } -variable "tempo_querier_limits_ram" { +variable "tempo_querier_limits_memory" { default = null } @@ -441,7 +441,7 @@ variable "tempo_query_frontend_requests_cpu" { default = null } -variable "tempo_query_frontend_requests_ram" { +variable "tempo_query_frontend_requests_memory" { default = null } @@ -449,7 +449,7 @@ variable "tempo_query_frontend_limits_cpu" { default = null } -variable "tempo_query_frontend_limits_ram" { +variable "tempo_query_frontend_limits_memory" { default = null } @@ -462,7 +462,7 @@ variable "tempo_gateway_requests_cpu" { default = null } -variable "tempo_gateway_requests_ram" { +variable "tempo_gateway_requests_memory" { default = null } @@ -470,7 +470,7 @@ variable "tempo_gateway_limits_cpu" { default = null } -variable "tempo_gateway_limits_ram" { +variable "tempo_gateway_limits_memory" { default = null }