Merge branch 'main' into main

Author: spanaik

terraform/eks/daemon/credentials/pod_identity/main.tf

@@ -194,17 +194,13 @@ resource "aws_security_group_rule" "nodes_cluster_inbound" {
   type                     = "ingress"
 }
 
-resource "null_resource" "clone_helm_chart" {
-  triggers = {
-    timestamp = "${timestamp()}" # Forces re-run on every apply
-  }
-  provisioner "local-exec" {
-    command = <<-EOT
-      if [ ! -d "./helm-charts" ]; then
-        git clone -b ${var.helm_chart_branch} https://github.com/aws-observability/helm-charts.git ./helm-charts
-      fi
-    EOT
-  }
+data "external" "clone_helm_chart" {
+  program = ["bash", "-c", <<-EOT
+    rm -rf ./helm-charts
+    git clone -b ${var.helm_chart_branch} https://github.com/aws-observability/helm-charts.git ./helm-charts
+    echo '{"status":"ready"}'
+  EOT
+  ]
 }
 
 resource "helm_release" "aws_observability" {
@@ -213,21 +209,22 @@ resource "helm_release" "aws_observability" {
   namespace        = "amazon-cloudwatch"
   create_namespace = true
 
-  set {
-    name  = "clusterName"
-    value = aws_eks_cluster.this.name
-  }
-
-  set {
-    name  = "region"
-    value = "us-west-2"
-  }
+  set = [
+    {
+      name  = "clusterName"
+      value = aws_eks_cluster.this.name
+    },
+    {
+      name  = "region"
+      value = var.region
+    }
+  ]
   depends_on = [
     aws_eks_cluster.this,
     aws_eks_node_group.this,
-    null_resource.clone_helm_chart,
     aws_eks_addon.pod_identity_addon,
     aws_eks_pod_identity_association.association,
+    data.external.clone_helm_chart,
   ]
 }
 

terraform/eks/daemon/credentials/pod_identity/providers.tf

@@ -17,10 +17,10 @@ provider "kubernetes" {
 }
 
 provider "helm" {
-  kubernetes {
+  kubernetes = {
     host                   = aws_eks_cluster.this.endpoint
     cluster_ca_certificate = base64decode(aws_eks_cluster.this.certificate_authority.0.data)
-    exec {
+    exec = {
       api_version = "client.authentication.k8s.io/v1beta1"
       args        = ["eks", "get-token", "--cluster-name", aws_eks_cluster.this.name]
       command     = "aws"

terraform/eks/daemon/entity/main.tf

@@ -163,38 +163,35 @@ resource "aws_security_group_rule" "nodes_cluster_inbound" {
   type                     = "ingress"
 }
 
-resource "null_resource" "clone_helm_chart" {
-  triggers = {
-    timestamp = "${timestamp()}" # Forces re-run on every apply
-  }
-  provisioner "local-exec" {
-    command = <<-EOT
-      if [ ! -d "./helm-charts" ]; then
-        git clone -b ${var.helm_chart_branch} https://github.com/aws-observability/helm-charts.git ./helm-charts
-      fi
-    EOT
-  }
+data "external" "clone_helm_chart" {
+  program = ["bash", "-c", <<-EOT
+    rm -rf ./helm-charts
+    git clone -b ${var.helm_chart_branch} https://github.com/aws-observability/helm-charts.git ./helm-charts
+    echo '{"status":"ready"}'
+  EOT
+  ]
 }
 
 resource "helm_release" "aws_observability" {
   name             = "amazon-cloudwatch-observability"
   chart            = "./helm-charts/charts/amazon-cloudwatch-observability"
   namespace        = "amazon-cloudwatch"
   create_namespace = true
-
-  set {
-    name  = "clusterName"
-    value = aws_eks_cluster.this.name
-  }
-
-  set {
-    name  = "region"
-    value = "us-west-2"
-  }
+  set = [
+    {
+      name  = "clusterName"
+      value = aws_eks_cluster.this.name
+    },
+    {
+      name  = "region"
+      value = var.region
+    }
+  ]
   depends_on = [
     aws_eks_cluster.this,
     aws_eks_node_group.this,
-  null_resource.clone_helm_chart]
+    data.external.clone_helm_chart,
+  ]
 }
 
 resource "null_resource" "kubectl" {

terraform/eks/daemon/entity/providers.tf

@@ -17,10 +17,10 @@ provider "kubernetes" {
 }
 
 provider "helm" {
-  kubernetes {
+  kubernetes = {
     host                   = aws_eks_cluster.this.endpoint
     cluster_ca_certificate = base64decode(aws_eks_cluster.this.certificate_authority.0.data)
-    exec {
+    exec = {
       api_version = "client.authentication.k8s.io/v1beta1"
       args        = ["eks", "get-token", "--cluster-name", aws_eks_cluster.this.name]
       command     = "aws"

terraform/eks/deployment/main.tf

@@ -47,7 +47,7 @@ resource "aws_eks_node_group" "this" {
     min_size     = 1
   }
 
-  ami_type       = "AL2_x86_64"
+  ami_type       = var.k8s_version >= "1.33" ? "AL2023_x86_64_STANDARD" : "AL2_x86_64"
   capacity_type  = "ON_DEMAND"
   disk_size      = 20
   instance_types = ["t3.medium"]