From fa8e32b699648142f15fdd3c0849a6cdeb846c8d Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Fri, 7 Mar 2025 19:27:01 -0500
Subject: [PATCH] add back required images

---
 README.md      |  2 ++
 copy_images.tf | 22 +++++++++++++++++++++-
 main.tf        |  4 ++++
 variables.tf   | 12 ++++++++++++
 4 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5b7ff48..efb515c 100644
--- a/README.md
+++ b/README.md
@@ -50,9 +50,11 @@ to loki.
 |------|-------------|------|---------|:--------:|
 | <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | EKS cluster name name component used through out the EKS cluster describing its purpose (ex: dice-dev) | `string` | n/a | yes |
 | <a name="input_enterprise_logs_provisioner_tag"></a> [enterprise\_logs\_provisioner\_tag](#input\_enterprise\_logs\_provisioner\_tag) | The version of the grafana/enterprise-logs-provisioner image to use. | `string` | `"v1.7.0"` | no |
+| <a name="input_exporter_tag"></a> [exporter\_tag](#input\_exporter\_tag) | The version of prom/memcached-exporter to use for the gateway. | `string` | `"v0.14.4"` | no |
 | <a name="input_gateway_tag"></a> [gateway\_tag](#input\_gateway\_tag) | The version of nginxinc/nginx-unprivileged to use for the gateway. | `string` | `"1.25.2-alpine"` | no |
 | <a name="input_loki_chart_version"></a> [loki\_chart\_version](#input\_loki\_chart\_version) | Which version of the grafana/loki helm chart to use. | `string` | `"6.10.2"` | no |
 | <a name="input_loki_tag"></a> [loki\_tag](#input\_loki\_tag) | The tag of the loki image to use. | `string` | `"3.1.1"` | no |
+| <a name="input_memcached_tag"></a> [memcached\_tag](#input\_memcached\_tag) | The version of memcached to use for the gateway. | `string` | `"1.6.23-alpine"` | no |
 | <a name="input_namespace"></a> [namespace](#input\_namespace) | The namespace into which grafana will be deployed | `string` | `"loki"` | no |
 | <a name="input_oidc_provider_arn"></a> [oidc\_provider\_arn](#input\_oidc\_provider\_arn) | The ARN in the EKS cluster for the OpenID Connect identity provider. | `string` | n/a | yes |
 | <a name="input_profile"></a> [profile](#input\_profile) | AWS config profile used to upload images into ECR | `string` | `""` | no |
diff --git a/copy_images.tf b/copy_images.tf
index b3e1517..b1547be 100644
--- a/copy_images.tf
+++ b/copy_images.tf
@@ -1,7 +1,9 @@
 locals {
+  exporter_key    = format("%v#%v", "prom/memcached-exporter", var.exporter_tag)
+  gateway_key     = format("%v#%v", "grafana/nginx-unprivileged", var.gateway_tag)
   loki_key        = format("%v#%v", "grafana/loki", var.loki_tag)
+  memcached_key   = format("%v#%v", "memcached", var.memcached_tag)
   provisioner_key = format("%v#%v", "grafana/enterprise-logs-provisioner", var.enterprise_logs_provisioner_tag)
-  gateway_key     = format("%v#%v", "grafana/nginx-unprivileged", var.gateway_tag)
   sidecar_key     = format("%v#%v", "kiwigrid/k8s-sidecar", var.sidecar_tag)
 
   image_config = [
@@ -14,6 +16,24 @@ locals {
       source_tag      = var.loki_tag
       tag             = var.loki_tag
     },
+    {
+      enabled         = true
+      dest_path       = null
+      name            = "memcached"
+      source_image    = "bitnami/memcached"
+      source_registry = "public.ecr.aws"
+      source_tag      = var.memcached_tag
+      tag             = var.memcached_tag
+    },
+    {
+      enabled         = true
+      dest_path       = null
+      name            = "prom/memcached-exporter"
+      source_image    = "prom/memcached-exporter"
+      source_registry = "docker.io"
+      source_tag      = var.exporter_tag
+      tag             = var.exporter_tag
+    },
     {
       enabled         = true
       dest_path       = null
diff --git a/main.tf b/main.tf
index 77704a1..5be6fda 100644
--- a/main.tf
+++ b/main.tf
@@ -55,6 +55,10 @@ resource "helm_release" "loki" {
       gateway_image_tag            = module.images.images[local.gateway_key].tag
       sidecar_image_repository     = split(":", module.images.images[local.sidecar_key].dest_full_path)[0]
       sidecar_image_tag            = module.images.images[local.sidecar_key].tag
+      memcached_image_repository   = split(":", module.images.images[local.memcached_key].dest_full_path)[0]
+      memcached_image_tag          = module.images.images[local.memcached_key].tag
+      exporter_image_repository    = split(":", module.images.images[local.exporter_key].dest_full_path)[0]
+      exporter_image_tag           = module.images.images[local.exporter_key].tag
       # Storage configuration
       s3_bucket_name = module.loki_s3.s3_requested_bucket_name
       region         = var.region
diff --git a/variables.tf b/variables.tf
index ad048a5..35009fe 100644
--- a/variables.tf
+++ b/variables.tf
@@ -65,6 +65,18 @@ variable "gateway_tag" {
   default     = "1.25.2-alpine"
 }
 
+variable "memcached_tag" {
+  description = "The version of memcached to use for the gateway."
+  type        = string
+  default     = "1.6.23-alpine"
+}
+
+variable "exporter_tag" {
+  description = "The version of prom/memcached-exporter to use for the gateway."
+  type        = string
+  default     = "v0.14.4"
+}
+
 variable "sidecar_tag" {
   description = "The version of kiwigrid/k8s-sidecar to use for the gateway."
   type        = string