From a6d337d9359e5cf57a44720a1984145724897780 Mon Sep 17 00:00:00 2001 From: david-rafay <76073534+david-rafay@users.noreply.github.com> Date: Wed, 22 Jul 2026 12:12:08 -0700 Subject: [PATCH 1/6] Update main.tf --- terraform/caas_terraform/eks/modules/eks/main.tf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/terraform/caas_terraform/eks/modules/eks/main.tf b/terraform/caas_terraform/eks/modules/eks/main.tf index 7216331..1121012 100644 --- a/terraform/caas_terraform/eks/modules/eks/main.tf +++ b/terraform/caas_terraform/eks/modules/eks/main.tf @@ -59,6 +59,7 @@ resource "rafay_eks_cluster" "cluster" { name = "karpenter" namespace = "karpenter" } + role_name = "${var.cluster_name}-karpenter-sa" attach_policy = < Date: Wed, 22 Jul 2026 12:15:07 -0700 Subject: [PATCH 2/6] Update main.tf --- terraform/caas_terraform/eks/modules/eks/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/caas_terraform/eks/modules/eks/main.tf b/terraform/caas_terraform/eks/modules/eks/main.tf index 1121012..ba75ce3 100644 --- a/terraform/caas_terraform/eks/modules/eks/main.tf +++ b/terraform/caas_terraform/eks/modules/eks/main.tf @@ -56,7 +56,7 @@ resource "rafay_eks_cluster" "cluster" { for_each = var.instance_profile != null ? [0] : [] content { metadata { - name = "karpenter" + name = "${var.cluster_name}-karpenter-sa" namespace = "karpenter" } role_name = "${var.cluster_name}-karpenter-sa" @@ -109,7 +109,7 @@ resource "rafay_eks_cluster" "cluster" { for_each = var.s3_bucket != null ? [0] : [] content { metadata { - name = "velero-rafay" + name = "${var.cluster_name}-velero-sa" namespace = "rafay-system" } role_name = "${var.cluster_name}-velero-sa" From 83aa019ddc1d9394bfd7e91a223a5e685ab3aa12 Mon Sep 17 00:00:00 2001 From: david-rafay <76073534+david-rafay@users.noreply.github.com> Date: Wed, 22 Jul 2026 13:10:52 -0700 Subject: [PATCH 3/6] Update main.tf --- .../caas_terraform/eks/modules/eks/main.tf | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/terraform/caas_terraform/eks/modules/eks/main.tf b/terraform/caas_terraform/eks/modules/eks/main.tf index ba75ce3..484385a 100644 --- a/terraform/caas_terraform/eks/modules/eks/main.tf +++ b/terraform/caas_terraform/eks/modules/eks/main.tf @@ -182,7 +182,7 @@ resource "rafay_eks_cluster" "cluster" { public_access = false } } - dynamic "managed_nodegroups" { + /*dynamic "managed_nodegroups" { for_each = var.managed_nodegroups content { name = managed_nodegroups.value.ng_name @@ -209,7 +209,24 @@ resource "rafay_eks_cluster" "cluster" { } labels = managed_nodegroups.value.labels } - } + }*/ + managed_nodegroups_map = { + "infra-terraform" = { + ami_family = "AmazonLinux2" + instance_type = "t3.large" + desired_capacity = 1 + min_size = 0 + max_size = 4 + volume_size = 80 + volume_type = "gp3" + version = "1.36" + private_networking = true + taints { + key = "node/infra" + effect = "NoSchedule" + operator = "Exists" + } + } addons { name = "aws-ebs-csi-driver" version = "latest" From e0e0c310aee492b64761f417b1de3428f7b2bb51 Mon Sep 17 00:00:00 2001 From: david-rafay <76073534+david-rafay@users.noreply.github.com> Date: Wed, 22 Jul 2026 13:17:39 -0700 Subject: [PATCH 4/6] Update main.tf --- terraform/caas_terraform/eks/modules/eks/main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/terraform/caas_terraform/eks/modules/eks/main.tf b/terraform/caas_terraform/eks/modules/eks/main.tf index 484385a..aa9e9a1 100644 --- a/terraform/caas_terraform/eks/modules/eks/main.tf +++ b/terraform/caas_terraform/eks/modules/eks/main.tf @@ -227,6 +227,7 @@ resource "rafay_eks_cluster" "cluster" { operator = "Exists" } } + } addons { name = "aws-ebs-csi-driver" version = "latest" From af11e0d0055cd5f9163a0c85368250260c83d2a2 Mon Sep 17 00:00:00 2001 From: david-rafay <76073534+david-rafay@users.noreply.github.com> Date: Wed, 22 Jul 2026 13:25:56 -0700 Subject: [PATCH 5/6] Update main.tf --- terraform/caas_terraform/eks/modules/eks/main.tf | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/terraform/caas_terraform/eks/modules/eks/main.tf b/terraform/caas_terraform/eks/modules/eks/main.tf index aa9e9a1..6acceeb 100644 --- a/terraform/caas_terraform/eks/modules/eks/main.tf +++ b/terraform/caas_terraform/eks/modules/eks/main.tf @@ -14,13 +14,13 @@ resource "rafay_eks_cluster" "cluster" { cloud_provider = var.cloud_credentials_name cni_provider = "aws-cni" proxy_config = {} - system_components_placement { + /*system_components_placement { tolerations { key = var.rafay_tol_key operator = var.rafay_tol_operator effect = var.rafay_tol_effect } - } + }*/ } } cluster_config { @@ -221,11 +221,6 @@ resource "rafay_eks_cluster" "cluster" { volume_type = "gp3" version = "1.36" private_networking = true - taints { - key = "node/infra" - effect = "NoSchedule" - operator = "Exists" - } } } addons { From 8d5aef81f66840750735f4c4d2af771ab58bcc36 Mon Sep 17 00:00:00 2001 From: david-rafay <76073534+david-rafay@users.noreply.github.com> Date: Wed, 22 Jul 2026 14:16:42 -0700 Subject: [PATCH 6/6] Update main.tf --- terraform/caas_terraform/eks/modules/eks/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/caas_terraform/eks/modules/eks/main.tf b/terraform/caas_terraform/eks/modules/eks/main.tf index 6acceeb..70fa8dc 100644 --- a/terraform/caas_terraform/eks/modules/eks/main.tf +++ b/terraform/caas_terraform/eks/modules/eks/main.tf @@ -212,7 +212,7 @@ resource "rafay_eks_cluster" "cluster" { }*/ managed_nodegroups_map = { "infra-terraform" = { - ami_family = "AmazonLinux2" + ami_family = "AmazonLinux2023" instance_type = "t3.large" desired_capacity = 1 min_size = 0