From fecabc9ee45c17cf751a7b00058a04978a2039aa Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Fri, 7 Mar 2025 14:47:44 -0500 Subject: [PATCH] cleanup --- README.md | 3 +- main.tf | 121 +-------------------------------------------------- s3.tf | 2 +- variables.tf | 5 --- 4 files changed, 4 insertions(+), 127 deletions(-) diff --git a/README.md b/README.md index 58e2c92..9b1b99e 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ to loki. | Name | Source | Version | |------|--------|---------| | [images](#module\_images) | git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/ | tf-upgrade | -| [loki\_irsa\_role](#module\_loki\_irsa\_role) | git@github.e.it.census.gov:SCT-Engineering/tfmod-custom-iam-role-for-service-account-eks.git | n/a | +| [loki\_irsa\_role](#module\_loki\_irsa\_role) | git@github.e.it.census.gov:SCT-Engineering/tfmod-custom-iam-role-for-service-account-eks.git// | main | | [loki\_s3](#module\_loki\_s3) | git@github.e.it.census.gov:terraform-modules/aws-s3.git//standard | tf-upgrade | ## Resources @@ -62,7 +62,6 @@ to loki. | [region](#input\_region) | The region holding these resources (for the s3 bucket.) | `string` | n/a | yes | | [rwo\_storage\_class](#input\_rwo\_storage\_class) | Specify the storage class for read/write/once persistent volumes. | `string` | `"gp3-encrypted"` | no | | [sidecar\_tag](#input\_sidecar\_tag) | The version of kiwigrid/k8s-sidecar to use for the gateway. | `string` | `"1.27.4"` | no | -| [tag\_costallocation](#input\_tag\_costallocation) | Tag CostAllocation (default) | `string` | `"csvd:infrastructure"` | no | | [tags](#input\_tags) | Additional tags to add to resources created in AWS (s3 bucket, ...) | `map(string)` | `{}` | no | ## Outputs diff --git a/main.tf b/main.tf index 315e83e..228df46 100644 --- a/main.tf +++ b/main.tf @@ -4,22 +4,9 @@ locals { gateway_internal_url = format("http://%v:%v", local.gateway_internal_hostname, local.gateway_internal_port_number) } -locals { - tags = merge({ - "boc:eks-cluster-name" = var.cluster_name - "boc:tf_module_name" = local.module_name - "boc:tf_module_version" = local.module_version - "boc:created_by" = "terraform" - CostAllocation = var.tag_costallocation - }, var.tags) - -} - module "loki_irsa_role" { - # source = "git@github.it.census.gov:SOA/tfmod-custom-iam-role-for-service-account-eks.git/?ref=1.0.0" - # tflint-ignore: terraform_module_version # tflint-ignore: terraform_module_pinned_source - source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-custom-iam-role-for-service-account-eks.git" + 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" @@ -40,7 +27,7 @@ module "loki_irsa_role" { namespace_service_accounts = ["${var.namespace}:loki"] } } - tags = local.tags + tags = var.tags } resource "helm_release" "loki" { @@ -80,107 +67,3 @@ resource "helm_release" "loki" { }) ] } - - -# # Storage-related dynamic configurations -# set { -# name = "loki.storage.bucketNames.chunks" -# value = module.loki_s3.s3_requested_bucket_name -# } -# set { -# name = "loki.storage.bucketNames.ruler" -# value = module.loki_s3.s3_requested_bucket_name -# } -# set { -# name = "loki.storage.bucketNames.admin" -# value = module.loki_s3.s3_requested_bucket_name -# } -# set { -# name = "loki.storage.type" -# value = "s3" -# } -# set { -# name = "loki.storage.s3.s3" -# value = format("s3://%v", var.region) -# } -# set { -# name = "loki.storage.s3.region" -# value = var.region -# } -# set { -# name = "loki.storage_config.aws.s3" -# value = format("s3://%v/%v", -# var.region, -# module.loki_s3.s3_requested_bucket_name -# ) -# } - -# # Storage class configurations -# set { -# name = "write.persistence.storageClass" -# value = var.rwo_storage_class -# } -# set { -# name = "backend.persistence.storageClass" -# value = var.rwo_storage_class -# } -# set { -# name = "read.persistence.storageClass" -# value = var.rwo_storage_class -# } - -# # Image configurations for additional components -# set { -# name = "loki.provisioner.image.repository" -# value = split(":", module.images.images[local.provisioner_key].dest_full_path)[0] -# } -# set { -# name = "loki.provisioner.image.tag" -# value = module.images.images[local.provisioner_key].tag -# } - -# set { -# name = "gateway.image.repository" -# value = module.images.images[local.gateway_key].dest_repository -# } -# set { -# name = "gateway.image.tag" -# value = module.images.images[local.gateway_key].tag -# } - -# set { -# name = "lokiCanary.image.repository" -# value = module.images.images[local.canary_key].dest_repository -# } -# set { -# name = "lokiCanary.image.tag" -# value = module.images.images[local.canary_key].tag -# } - -# set { -# name = "sidecar.image.repository" -# value = split(":", module.images.images[local.sidecar_key].dest_full_path)[0] -# } -# set { -# name = "sidecar.image.tag" -# value = module.images.images[local.sidecar_key].tag -# } - -# set { -# name = "memcached.image.repository" -# value = split(":", module.images.images[local.memcached_key].dest_full_path)[0] -# } -# set { -# name = "memcached.image.tag" -# value = module.images.images[local.memcached_key].tag -# } - -# set { -# name = "memcachedExporter.image.repository" -# value = split(":", module.images.images[local.exporter_key].dest_full_path)[0] -# } -# set { -# name = "memcachedExporter.image.tag" -# value = module.images.images[local.exporter_key].tag -# } -# } diff --git a/s3.tf b/s3.tf index cac37c6..dd5a704 100644 --- a/s3.tf +++ b/s3.tf @@ -15,5 +15,5 @@ module "loki_s3" { bucket_name = format("%v-loki", var.cluster_name) access_log_bucket = data.aws_s3_bucket.s3_server_access_logs.id - tags = local.tags + tags = var.tags } diff --git a/variables.tf b/variables.tf index 650fac4..9a1a10f 100644 --- a/variables.tf +++ b/variables.tf @@ -1,8 +1,3 @@ -variable "tag_costallocation" { - description = "Tag CostAllocation (default)" - type = string - default = "csvd:infrastructure" -} variable "tags" { description = "Additional tags to add to resources created in AWS (s3 bucket, ...)"