From d4504d537d1a78d4e3ef182829a653c5d2714a96 Mon Sep 17 00:00:00 2001
From: Seth Levine <sethlevi@amazon.com>
Date: Wed, 19 Jan 2022 14:48:16 -0500
Subject: [PATCH 1/2] Allow Arm64 Prometheus App Mesh Containers

Allow App-Mesh Helm Chart On ARM64
---
 terraform/eks/appmesh/appmesh.tf | 6 +++---
 terraform/eks/haproxy/haproxy.tf | 2 +-
 terraform/eks/jmx/jmx.tf         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/terraform/eks/appmesh/appmesh.tf b/terraform/eks/appmesh/appmesh.tf
index 45b441c98..cc730a15d 100644
--- a/terraform/eks/appmesh/appmesh.tf
+++ b/terraform/eks/appmesh/appmesh.tf
@@ -91,7 +91,7 @@ resource "helm_release" "eks" {
 
   repository = "https://aws.github.io/eks-charts"
   chart      = "appmesh-controller"
-  version    = "1.3.0"
+  version    = "1.4"
 
   set {
     name  = "serviceAccount.create"
@@ -154,8 +154,8 @@ data "template_file" "traffic_deployment_file" {
   vars = {
     APP_NAMESPACE   = kubernetes_namespace.traffic_ns.metadata[0].name
     MESH_NAME       = local.mesh_name
-    FRONT_APP_IMAGE = "${var.sample_app_image_repo}:feapp"
-    COLOR_APP_IMAGE = "${var.sample_app_image_repo}:colorapp"
+    FRONT_APP_IMAGE = "${var.sample_app_image_repo}:feapp-latest"
+    COLOR_APP_IMAGE = "${var.sample_app_image_repo}:colorapp-latest"
   }
 
   depends_on = [
diff --git a/terraform/eks/haproxy/haproxy.tf b/terraform/eks/haproxy/haproxy.tf
index c4ecda5e5..67fc6cfad 100644
--- a/terraform/eks/haproxy/haproxy.tf
+++ b/terraform/eks/haproxy/haproxy.tf
@@ -33,7 +33,7 @@ resource "helm_release" "haproxy" {
 
   repository = "https://haproxy-ingress.github.io/charts"
   chart      = "haproxy-ingress"
-  version    = "0.11.4"
+  version    = "0.13"
 
   set {
     name  = "defaultBackend.enabled"
diff --git a/terraform/eks/jmx/jmx.tf b/terraform/eks/jmx/jmx.tf
index 08782440b..807596a62 100644
--- a/terraform/eks/jmx/jmx.tf
+++ b/terraform/eks/jmx/jmx.tf
@@ -34,7 +34,7 @@ output "metric_dimension_namespace" {
 
 locals {
   traffic_generator_image = "${var.sample_app_image_repo}:traffic-generator"
-  jmx_sample_app_image    = "${var.sample_app_image_repo}:tomcatapp"
+  jmx_sample_app_image    = "${var.sample_app_image_repo}:tomcatapp-latest"
 }
 
 resource "kubernetes_namespace" "jmx_ns" {

From b8bb18959e05d29fd6bbdf9c28ea2e70bd388dc4 Mon Sep 17 00:00:00 2001
From: Anthony J Mirabella <a9@aneurysm9.com>
Date: Fri, 2 Dec 2022 12:24:05 -0500
Subject: [PATCH 2/2] fix terraform lint issue

Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com>
---
 terraform/eks/haproxy/haproxy.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/eks/haproxy/haproxy.tf b/terraform/eks/haproxy/haproxy.tf
index 6e734ea71..37585fcb9 100644
--- a/terraform/eks/haproxy/haproxy.tf
+++ b/terraform/eks/haproxy/haproxy.tf
@@ -34,7 +34,7 @@ resource "helm_release" "haproxy" {
   repository = "https://haproxy-ingress.github.io/charts"
   chart      = "haproxy-ingress"
   version    = "0.13.9"
-  
+
   set {
     name  = "defaultBackend.enabled"
     value = "true"