no version pinning to test and make breaking changes

vasireddy99 · vasireddy99 · commit edb6b9250b9d · 2025-07-30T21:37:07.000-07:00
diff --git a/terraform/eks/adot-operator/adot_operator.tf b/terraform/eks/adot-operator/adot_operator.tf
@@ -55,25 +55,24 @@ resource "helm_release" "adot-operator" {
     file("./adot-operator/adot-operator-values.yaml")
   ]
 
-  set {
-    name  = "manager.image.repository"
-    value = var.operator_repository
-  }
-
-  set {
-    name  = "manager.image.tag"
-    value = var.operator_tag
-  }
-
-  set {
-    name  = "manager.collectorImage.tag"
-    value = var.aoc_version
-  }
-
-  set {
-    name  = "manager.collectorImage.repository"
-    value = var.aoc_image_repo
-  }
+  set = [
+    {
+      name  = "manager.image.repository"
+      value = var.operator_repository
+    },
+    {
+      name  = "manager.image.tag"
+      value = var.operator_tag
+    },
+    {
+      name  = "manager.collectorImage.tag"
+      value = var.aoc_version
+    },
+    {
+      name  = "manager.collectorImage.repository"
+      value = var.aoc_image_repo
+    }
+  ]
 
   depends_on = [kubernetes_namespace.adot_operator_ns]
 }
diff --git a/terraform/eks/appmesh/appmesh.tf b/terraform/eks/appmesh/appmesh.tf
@@ -92,21 +92,24 @@ resource "helm_release" "eks" {
   repository = "https://aws.github.io/eks-charts"
   chart      = "appmesh-controller"
   version    = "1.9.0"
+  set = [
+    {
+      name  = "serviceAccount.create"
+      type  = "string"
+      value = "false"
+    },
+    {
+      name  = "serviceAccount.name"
+      type  = "string"
+      value = kubernetes_service_account.appmesh_sa.metadata[0].name
+    },
+    {
+      name  = "region"
+      type  = "string"
+      value = var.region
+    }
+  ]
 
-  set {
-    name  = "serviceAccount.create"
-    value = "false"
-  }
-
-  set {
-    name  = "serviceAccount.name"
-    value = kubernetes_service_account.appmesh_sa.metadata[0].name
-  }
-
-  set {
-    name  = "region"
-    value = var.region
-  }
 
   provisioner "local-exec" {
     command = "kubectl --kubeconfig=${var.kubeconfig} apply -k \"github.com/aws/eks-charts/stable/appmesh-controller/crds?ref=v0.0.116\""
diff --git a/terraform/eks/haproxy/haproxy.tf b/terraform/eks/haproxy/haproxy.tf
@@ -35,26 +35,29 @@ resource "helm_release" "haproxy" {
   chart      = "haproxy-ingress"
   version    = "0.13.9"
 
-  set {
-    name  = "defaultBackend.enabled"
-    value = "true"
-  }
-  set {
-    name  = "controller.stats.enabled"
-    value = "true"
-  }
-  set {
-    name  = "controller.metrics.enabled"
-    value = "true"
-  }
-  set {
-    name  = "controller.metrics.service.annotations.prometheus\\.io/port"
-    type  = "string"
-    value = "9101"
-  }
-  set {
-    name  = "controller.metrics.service.annotations.prometheus\\.io/scrape"
-    type  = "string"
-    value = "true"
-  }
+  set = [
+    {
+      name  = "defaultBackend.enabled"
+      value = "true"
+    },
+    {
+      name  = "controller.stats.enabled"
+      value = "true"
+    },
+    {
+      name  = "controller.metrics.enabled"
+      value = "true"
+    },
+    {
+      name  = "controller.metrics.service.annotations.prometheus\\.io/port"
+      type  = "string"
+      value = "9101"
+    },
+    {
+      name  = "controller.metrics.service.annotations.prometheus\\.io/scrape"
+      type  = "string"
+      value = "true"
+    }
+  ]
+
 }
diff --git a/terraform/eks/main.tf b/terraform/eks/main.tf
@@ -75,7 +75,7 @@ resource "local_file" "kubeconfig" {
 }
 
 provider "helm" {
-  kubernetes {
+  kubernetes = {
     host                   = data.aws_eks_cluster.testing_cluster.endpoint
     cluster_ca_certificate = base64decode(data.aws_eks_cluster.testing_cluster.certificate_authority[0].data)
     token                  = data.aws_eks_cluster_auth.testing_cluster.token
diff --git a/terraform/eks/memcached-service/memcached.tf b/terraform/eks/memcached-service/memcached.tf
@@ -34,19 +34,20 @@ resource "helm_release" "bitnami" {
   repository = "https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami"
   chart      = "memcached"
   version    = "5.8.1"
-
-  set {
-    name  = "metrics.enabled"
-    value = "true"
-  }
-  set {
-    name  = "serviceAnnotations.prometheus\\.io/port"
-    type  = "string"
-    value = "9150"
-  }
-  set {
-    name  = "serviceAnnotations.prometheus\\.io/scrape"
-    type  = "string"
-    value = "true"
-  }
+  set = [
+    {
+      name  = "metrics.enabled"
+      value = "true"
+    },
+    {
+      name  = "serviceAnnotations.prometheus\\.io/port"
+      type  = "string"
+      value = "9150"
+    },
+    {
+      name  = "serviceAnnotations.prometheus\\.io/scrape"
+      type  = "string"
+      value = "true"
+    }
+  ]
 }
diff --git a/terraform/eks/nginx/nginx.tf b/terraform/eks/nginx/nginx.tf
@@ -46,20 +46,23 @@ resource "helm_release" "nginx_ingress" {
   chart      = "ingress-nginx"
   version    = "4.4.0"
 
-  set {
-    name  = "controller.metrics.enabled"
-    value = "true"
-  }
-  set {
-    name  = "controller.metrics.service.annotations.prometheus\\.io/port"
-    type  = "string"
-    value = "10254"
-  }
-  set {
-    name  = "controller.metrics.service.annotations.prometheus\\.io/scrape"
-    type  = "string"
-    value = "true"
-  }
+  set = [
+    {
+      name  = "controller.metrics.enabled"
+      value = "true"
+    },
+    {
+      name  = "controller.metrics.service.annotations.prometheus\\.io/port"
+      type  = "string"
+      value = "10254"
+    },
+    {
+      name  = "controller.metrics.service.annotations.prometheus\\.io/scrape"
+      type  = "string"
+      value = "true"
+    }
+  ]
+
 
   provisioner "local-exec" {
     command = "/bin/bash ./nginx/get-service-external-ip.sh"
diff --git a/terraform/eks/otlp.tf b/terraform/eks/otlp.tf
@@ -130,8 +130,6 @@ resource "kubernetes_config_map" "aoc_config_map" {
 
   data = {
     "aoc-config.yml" = module.basic_components.0.otconfig_content
-    "client.qps"    = "100"
-    "client.burst"  = "400"
   }
   depends_on = [kubernetes_service_account.sample-app-sa]
 }
@@ -144,10 +142,9 @@ resource "kubernetes_config_map" "mocked_server_cert" {
     name      = "mocked-server-cert"
     namespace = var.deployment_type == "fargate" ? kubernetes_namespace.aoc_fargate_ns.metadata[0].name : kubernetes_namespace.aoc_ns.metadata[0].name
   }
+
   data = {
     "ca-bundle.crt" = module.basic_components.0.mocked_server_cert_content
-    "client.qps"    = "100"
-    "client.burst"  = "400"
   }
 }
 
@@ -216,8 +213,8 @@ resource "kubernetes_deployment" "aoc_deployment" {
               path = "/"
               port = 8080
             }
-            initial_delay_seconds = 60
-            period_seconds        = 30
+            initial_delay_seconds = 10
+            period_seconds        = 5
           }
         }
 
@@ -230,7 +227,7 @@ resource "kubernetes_deployment" "aoc_deployment" {
 
           resources {
             limits = {
-              cpu    = "200m"
+              cpu    = "100m"
               memory = "256Mi"
             }
           }
@@ -257,10 +254,6 @@ resource "kubernetes_service" "mocked_server_service" {
   metadata {
     name      = "mocked-server"
     namespace = var.deployment_type == "fargate" ? kubernetes_namespace.aoc_fargate_ns.metadata[0].name : kubernetes_namespace.aoc_ns.metadata[0].name
-    annotations = {
-      "qps.authentication.k8s.io"   = "100"
-      "burst.authentication.k8s.io" = "400"
-    }
   }
   spec {
     selector = {
@@ -272,9 +265,6 @@ resource "kubernetes_service" "mocked_server_service" {
       target_port = 8080
     }
   }
-  timeouts {
-    create = "20m"
-  }
 }
 
 resource "kubectl_manifest" "aoc_deployment_adot_operator" {
@@ -321,10 +311,6 @@ resource "kubernetes_service" "sample_app_service" {
   metadata {
     name      = "sample-app"
     namespace = var.deployment_type == "fargate" ? kubernetes_namespace.aoc_fargate_ns.metadata[0].name : kubernetes_namespace.aoc_ns.metadata[0].name
-    annotations = {
-      "qps.authentication.k8s.io"   = "100"
-      "burst.authentication.k8s.io" = "400"
-    }
   }
   spec {
     selector = {
@@ -338,9 +324,6 @@ resource "kubernetes_service" "sample_app_service" {
       target_port = module.common.sample_app_listen_address_port
     }
   }
-  timeouts {
-    create = "20m"
-  }
 }
 
 resource "kubernetes_ingress" "app" {
diff --git a/terraform/eks/otlp/otlp.tf b/terraform/eks/otlp/otlp.tf
@@ -13,6 +13,13 @@
 # permissions and limitations under the License.
 # -------------------------------------------------------------------------
 
+terraform {
+  required_providers {
+    kubernetes = {
+      version = "~> 2.0"
+    }
+  }
+}
 
 locals {
   eks_pod_config = yamldecode(data.template_file.eksconfig.rendered)["sample_app"]
diff --git a/terraform/eks/otlp/versions.tf b/terraform/eks/otlp/versions.tf
diff --git a/terraform/eks/versions.tf b/terraform/eks/versions.tf
@@ -1,21 +1,17 @@
 terraform {
-  required_version = "1.5.7"
+  required_version = "~> 1.0"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "4.67.0"
+      version = "~> 4.0"
     }
     kubernetes = {
-      version = "2.36.0"
-    }
-    helm ={
-      source = "hashicorp/helm"
-      version = "2.17.0"
+      version = "~> 2.0"
     }
     kubectl = {
       source  = "gavinbunney/kubectl"
-      version = "1.19.0"
+      version = ">= 1.7.0"
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ resource "local_file" "kubeconfig" {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`provider "helm" {`
`78`		`- kubernetes {`
	`78`	`+ kubernetes = {`
`79`	`79`	`host = data.aws_eks_cluster.testing_cluster.endpoint`
`80`	`80`	`cluster_ca_certificate = base64decode(data.aws_eks_cluster.testing_cluster.certificate_authority[0].data)`
`81`	`81`	`token = data.aws_eks_cluster_auth.testing_cluster.token`
Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,6 @@ resource "kubernetes_config_map" "aoc_config_map" {`
`130`	`130`
`131`	`131`	`data = {`
`132`	`132`	`"aoc-config.yml" = module.basic_components.0.otconfig_content`
`133`		`- "client.qps" = "100"`
`134`		`- "client.burst" = "400"`
`135`	`133`	`}`
`136`	`134`	`depends_on = [kubernetes_service_account.sample-app-sa]`
`137`	`135`	`}`
`@@ -144,10 +142,9 @@ resource "kubernetes_config_map" "mocked_server_cert" {`
`144`	`142`	`name = "mocked-server-cert"`
`145`	`143`	`namespace = var.deployment_type == "fargate" ? kubernetes_namespace.aoc_fargate_ns.metadata[0].name : kubernetes_namespace.aoc_ns.metadata[0].name`
`146`	`144`	`}`
	`145`	`+`
`147`	`146`	`data = {`
`148`	`147`	`"ca-bundle.crt" = module.basic_components.0.mocked_server_cert_content`
`149`		`- "client.qps" = "100"`
`150`		`- "client.burst" = "400"`
`151`	`148`	`}`
`152`	`149`	`}`
`153`	`150`
`@@ -216,8 +213,8 @@ resource "kubernetes_deployment" "aoc_deployment" {`
`216`	`213`	`path = "/"`
`217`	`214`	`port = 8080`
`218`	`215`	`}`
`219`		`- initial_delay_seconds = 60`
`220`		`- period_seconds = 30`
	`216`	`+ initial_delay_seconds = 10`
	`217`	`+ period_seconds = 5`
`221`	`218`	`}`
`222`	`219`	`}`
`223`	`220`
`@@ -230,7 +227,7 @@ resource "kubernetes_deployment" "aoc_deployment" {`
`230`	`227`
`231`	`228`	`resources {`
`232`	`229`	`limits = {`
`233`		`- cpu = "200m"`
	`230`	`+ cpu = "100m"`
`234`	`231`	`memory = "256Mi"`
`235`	`232`	`}`
`236`	`233`	`}`
`@@ -257,10 +254,6 @@ resource "kubernetes_service" "mocked_server_service" {`
`257`	`254`	`metadata {`
`258`	`255`	`name = "mocked-server"`
`259`	`256`	`namespace = var.deployment_type == "fargate" ? kubernetes_namespace.aoc_fargate_ns.metadata[0].name : kubernetes_namespace.aoc_ns.metadata[0].name`
`260`		`- annotations = {`
`261`		`- "qps.authentication.k8s.io" = "100"`
`262`		`- "burst.authentication.k8s.io" = "400"`
`263`		`- }`
`264`	`257`	`}`
`265`	`258`	`spec {`
`266`	`259`	`selector = {`
`@@ -272,9 +265,6 @@ resource "kubernetes_service" "mocked_server_service" {`
`272`	`265`	`target_port = 8080`
`273`	`266`	`}`
`274`	`267`	`}`
`275`		`- timeouts {`
`276`		`- create = "20m"`
`277`		`- }`
`278`	`268`	`}`
`279`	`269`
`280`	`270`	`resource "kubectl_manifest" "aoc_deployment_adot_operator" {`
`@@ -321,10 +311,6 @@ resource "kubernetes_service" "sample_app_service" {`
`321`	`311`	`metadata {`
`322`	`312`	`name = "sample-app"`
`323`	`313`	`namespace = var.deployment_type == "fargate" ? kubernetes_namespace.aoc_fargate_ns.metadata[0].name : kubernetes_namespace.aoc_ns.metadata[0].name`
`324`		`- annotations = {`
`325`		`- "qps.authentication.k8s.io" = "100"`
`326`		`- "burst.authentication.k8s.io" = "400"`
`327`		`- }`
`328`	`314`	`}`
`329`	`315`	`spec {`
`330`	`316`	`selector = {`
`@@ -338,9 +324,6 @@ resource "kubernetes_service" "sample_app_service" {`
`338`	`324`	`target_port = module.common.sample_app_listen_address_port`
`339`	`325`	`}`
`340`	`326`	`}`
`341`		`- timeouts {`
`342`		`- create = "20m"`
`343`		`- }`
`344`	`327`	`}`
`345`	`328`
`346`	`329`	`resource "kubernetes_ingress" "app" {`
Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,17 @@`
`1`	`1`	`terraform {`
`2`		`- required_version = "1.5.7"`
	`2`	`+ required_version = "~> 1.0"`
`3`	`3`
`4`	`4`	`required_providers {`
`5`	`5`	`aws = {`
`6`	`6`	`source = "hashicorp/aws"`
`7`		`- version = "4.67.0"`
	`7`	`+ version = "~> 4.0"`
`8`	`8`	`}`
`9`	`9`	`kubernetes = {`
`10`		`- version = "2.36.0"`
`11`		`- }`
`12`		`- helm ={`
`13`		`- source = "hashicorp/helm"`
`14`		`- version = "2.17.0"`
	`10`	`+ version = "~> 2.0"`
`15`	`11`	`}`
`16`	`12`	`kubectl = {`
`17`	`13`	`source = "gavinbunney/kubectl"`
`18`		`- version = "1.19.0"`
	`14`	`+ version = ">= 1.7.0"`
`19`	`15`	`}`
`20`	`16`	`}`
`21`	`17`	`}`