From e6b302e668c6a52d1205ebaee9e4d39cb636802f Mon Sep 17 00:00:00 2001 From: Matthew Creal Morgan Date: Wed, 25 Jun 2025 11:09:43 -0700 Subject: [PATCH] update sources (#14) --- README.md | 13 +++++++------ copy_images.tf | 7 ++++++- main.tf | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index abaf214..796f70d 100644 --- a/README.md +++ b/README.md @@ -67,18 +67,18 @@ resource "kubernetes_manifest" "example_grafana_datasource" { | Name | Version | |------|---------| -| [aws](#provider\_aws) | 5.94.1 | -| [aws.eecr](#provider\_aws.eecr) | 5.94.1 | -| [helm](#provider\_helm) | 2.17.0 | -| [null](#provider\_null) | 3.2.3 | +| [aws](#provider\_aws) | 6.0.0 | +| [aws.eecr](#provider\_aws.eecr) | 6.0.0 | +| [helm](#provider\_helm) | 3.0.2 | +| [null](#provider\_null) | 3.2.4 | | [terraform](#provider\_terraform) | n/a | ## Modules | Name | Source | Version | |------|--------|---------| -| [images](#module\_images) | git::https://github.e.it.census.gov/terraform-modules/aws-ecr-copy-images.git/ | tf-upgrade | -| [loki\_irsa\_role](#module\_loki\_irsa\_role) | git::https://github.e.it.census.gov/SCT-Engineering/tfmod-custom-iam-role-for-service-account-eks.git// | main | +| [images](#module\_images) | git::https://github.e.it.census.gov/terraform-modules/aws-ecr-copy-images.git | tf-upgrade | +| [loki\_irsa\_role](#module\_loki\_irsa\_role) | git::https://github.e.it.census.gov/SCT-Engineering/tfmod-custom-iam-role-for-service-account-eks.git | main | | [loki\_s3](#module\_loki\_s3) | git::https://github.e.it.census.gov/terraform-modules/aws-s3.git//standard | tf-upgrade | ## Resources @@ -119,6 +119,7 @@ resource "kubernetes_manifest" "example_grafana_datasource" { | Name | Description | |------|-------------| | [gateway\_internal\_endpoint](#output\_gateway\_internal\_endpoint) | The endpoint which can be used inside of the cluster to access loki-gateway. | +| [image\_config](#output\_image\_config) | Map of image references to their full source paths | | [module\_name](#output\_module\_name) | The name of this module. | | [module\_version](#output\_module\_version) | The version of this module. | | [rwo\_storage\_class](#output\_rwo\_storage\_class) | Specify the storage class for read/write/once persistent volumes. | diff --git a/copy_images.tf b/copy_images.tf index 7237fdf..2e482a3 100644 --- a/copy_images.tf +++ b/copy_images.tf @@ -66,7 +66,7 @@ locals { } module "images" { - source = "git::https://github.e.it.census.gov/terraform-modules/aws-ecr-copy-images.git/?ref=tf-upgrade" + source = "git::https://github.e.it.census.gov/terraform-modules/aws-ecr-copy-images.git?ref=tf-upgrade" profile = var.profile application_name = var.cluster_name @@ -99,3 +99,8 @@ provider "aws" { profile = var.eecr_info.profile region = var.eecr_info.region } + +output "image_config" { + description = "Map of image references to their full source paths" + value = local.image_config +} diff --git a/main.tf b/main.tf index a2a269c..b9b81ef 100644 --- a/main.tf +++ b/main.tf @@ -6,7 +6,7 @@ locals { module "loki_irsa_role" { # tflint-ignore: terraform_module_pinned_source - source = "git::https://github.e.it.census.gov/SCT-Engineering/tfmod-custom-iam-role-for-service-account-eks.git//?ref=main" + source = "git::https://github.e.it.census.gov/SCT-Engineering/tfmod-custom-iam-role-for-service-account-eks.git?ref=main" role_name = format("%v%v-%v", local.prefixes["eks-role"], var.cluster_name, "loki")