From 8a2e85af61eb109e6d5f1bbe66e8b78c13ee8521 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Fri, 21 Mar 2025 20:41:04 -0400 Subject: [PATCH] update names and resources --- main.tf | 2 +- prefixes.tf | 34 ++++++++++++++++++++++++++++++++++ values/loki.yml.tpl | 32 +++++++++++++++++++++++++++++--- 3 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 prefixes.tf diff --git a/main.tf b/main.tf index 5be6fda..e1df774 100644 --- a/main.tf +++ b/main.tf @@ -8,7 +8,7 @@ module "loki_irsa_role" { # tflint-ignore: terraform_module_pinned_source source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-custom-iam-role-for-service-account-eks.git//?ref=main" - role_name = "r-${var.cluster_name}-loki" + role_name = format("%v%v-%v", local.prefixes["eks-role"], var.cluster_name, "-loki") attach_s3_bucket_owner_policy = true attach_encrypted_object_manager_policy = true diff --git a/prefixes.tf b/prefixes.tf new file mode 100644 index 0000000..4e2709e --- /dev/null +++ b/prefixes.tf @@ -0,0 +1,34 @@ +locals { + prefixes = { + "efs" = "v-efs-" + "s3" = "v-s3-" + "ebs" = "v-ebs-" + "kms" = "k-kms-" + "role" = "r-" + "policy" = "p-" + "group" = "g-" + "security-group" = "" # "sg-" + # VPC + "vpc" = "" + "dhcp-options" = "" + "vpc-peer" = "vpcp-" + "route-table" = "route-" + "subnet" = "" + "vpc-endpoint" = "vpce-" + "elastic-ip" = "eip-" + "nat-gateway" = "nat-" + "internet-gateway" = "igw-" + "network-acl" = "nacl-" + "customer-gateway" = "cgw-" + "vpn-gateway" = "vpcg-" + "vpn-connection" = "vpn_" + "log-group" = "lg-" + "log-stream" = "lgs-" + # EKS + "eks" = "eks-" + "eks-user" = "s-eks-" + "eks-role" = "r-eks-" + "eks-policy" = "p-eks-" + "eks-security-group" = "eks-sg-" # "sg-eks-" + } +} diff --git a/values/loki.yml.tpl b/values/loki.yml.tpl index 2a89401..827098e 100644 --- a/values/loki.yml.tpl +++ b/values/loki.yml.tpl @@ -60,12 +60,25 @@ backend: enabled: true minReplicas: 1 targetCPUUtilizationPercentage: 80 + behavior: + scaleUp: + stabilizationWindowSeconds: 300 + policies: + - type: Pods + value: 1 + periodSeconds: 60 + scaleDown: + stabilizationWindowSeconds: 300 + policies: + - type: Pods + value: 1 + periodSeconds: 180 persistence: storageClass: ${rwo_storage_class} replicas: 3 resources: requests: - cpu: 10m + cpu: 100m memory: 128Mi limits: cpu: 1000m @@ -90,7 +103,7 @@ gateway: replicas: 1 resources: requests: - cpu: 10m + cpu: 100m memory: 128Mi limits: cpu: 100m @@ -120,10 +133,23 @@ read: enabled: true minReplicas: 1 targetCPUUtilizationPercentage: 80 + behavior: + scaleUp: + stabilizationWindowSeconds: 300 + policies: + - type: Pods + value: 1 + periodSeconds: 60 + scaleDown: + stabilizationWindowSeconds: 300 + policies: + - type: Pods + value: 1 + periodSeconds: 180 replicas: 3 resources: requests: - cpu: 10m + cpu: 100m memory: 128Mi limits: cpu: 500m