From 12c8bd4daf67e49b9d52a5975d828937840dc975 Mon Sep 17 00:00:00 2001 From: david-rafay <76073534+david-rafay@users.noreply.github.com> Date: Tue, 19 Nov 2024 18:46:08 -0800 Subject: [PATCH 1/6] Update main.tf --- terraform/pas_terraform/eks/modules/eks/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/pas_terraform/eks/modules/eks/main.tf b/terraform/pas_terraform/eks/modules/eks/main.tf index 3edbd3a..35067c4 100644 --- a/terraform/pas_terraform/eks/modules/eks/main.tf +++ b/terraform/pas_terraform/eks/modules/eks/main.tf @@ -75,7 +75,7 @@ resource "rafay_eks_cluster" "cluster" { for_each = var.managed_nodegroups content { name = managed_nodegroups.value.ng_name - ami_family = "AmazonLinux2" + ami_family = "AmazonLinux2023" iam { iam_node_group_with_addon_policies { image_builder = true @@ -113,4 +113,4 @@ resource "rafay_eks_cluster" "cluster" { configuration_values = "{\"controller\":{\"tolerations\":[{\"key\":\"CriticalAddonsOnly\",\"operator\":\"Exists\"},{\"operator\":\"Exists\"}]}}" } } -} \ No newline at end of file +} From d154711ef44f40aa43cac62eccb3db4333701b88 Mon Sep 17 00:00:00 2001 From: david-rafay <76073534+david-rafay@users.noreply.github.com> Date: Tue, 19 Nov 2024 19:49:12 -0800 Subject: [PATCH 2/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 7216331..80333ee 100644 --- a/terraform/caas_terraform/eks/modules/eks/main.tf +++ b/terraform/caas_terraform/eks/modules/eks/main.tf @@ -184,7 +184,7 @@ resource "rafay_eks_cluster" "cluster" { for_each = var.managed_nodegroups content { name = managed_nodegroups.value.ng_name - ami_family = "AmazonLinux2" + ami_family = "AmazonLinux2023" iam { iam_node_group_with_addon_policies { image_builder = true From e693a4667c4bad1457031515bf5131c385d8a8b4 Mon Sep 17 00:00:00 2001 From: david-rafay <76073534+david-rafay@users.noreply.github.com> Date: Tue, 19 Nov 2024 22:04:39 -0800 Subject: [PATCH 3/6] Update main.tf --- .../caas_terraform/eks/modules/eks/main.tf | 110 ------------------ 1 file changed, 110 deletions(-) diff --git a/terraform/caas_terraform/eks/modules/eks/main.tf b/terraform/caas_terraform/eks/modules/eks/main.tf index 80333ee..fcdae90 100644 --- a/terraform/caas_terraform/eks/modules/eks/main.tf +++ b/terraform/caas_terraform/eks/modules/eks/main.tf @@ -41,119 +41,9 @@ resource "rafay_eks_cluster" "cluster" { username = "cluster-admin" } } - dynamic "arns" { - for_each = var.instance_profile != null ? [0] : [] - content { - arn = var.instance_profile - group = ["system:bootstrappers", "system:nodes"] - username = "system:node:{{EC2PrivateDNSName}}" - } - } } iam { with_oidc = "true" - dynamic "service_accounts" { - for_each = var.instance_profile != null ? [0] : [] - content { - metadata { - name = "karpenter" - namespace = "karpenter" - } - attach_policy = < Date: Tue, 19 Nov 2024 22:05:24 -0800 Subject: [PATCH 4/6] Update variables.tf --- terraform/caas_terraform/eks/modules/eks/variables.tf | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/terraform/caas_terraform/eks/modules/eks/variables.tf b/terraform/caas_terraform/eks/modules/eks/variables.tf index e7f7018..918004d 100644 --- a/terraform/caas_terraform/eks/modules/eks/variables.tf +++ b/terraform/caas_terraform/eks/modules/eks/variables.tf @@ -27,21 +27,10 @@ variable "cluster_admin_iam_roles" { description = "IAM Roles to be granted cluster-admin access." } -variable "instance_profile" { - type = string - default = "null" -} - variable "k8s_version" { type = string } -variable "s3_bucket" { - type = string - default = "null" - description = "The name of the AWS S3 bucket for storing backups" -} - variable "cluster_labels" { type = map(string) description = "Map of cluster labels for cluster" From 6a88a9d7f33e5add7c5c95e05fbb53f6ecbe50aa Mon Sep 17 00:00:00 2001 From: david-rafay <76073534+david-rafay@users.noreply.github.com> Date: Tue, 19 Nov 2024 22:34:34 -0800 Subject: [PATCH 5/6] Update main.tf --- terraform/caas_terraform/eks/modules/eks/main.tf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/terraform/caas_terraform/eks/modules/eks/main.tf b/terraform/caas_terraform/eks/modules/eks/main.tf index fcdae90..0ff0263 100644 --- a/terraform/caas_terraform/eks/modules/eks/main.tf +++ b/terraform/caas_terraform/eks/modules/eks/main.tf @@ -46,9 +46,7 @@ resource "rafay_eks_cluster" "cluster" { with_oidc = "true" } vpc { - dynamic "subnets" { - for_each = var.create_vpc ? {} : {} - content { + subnets { dynamic "private" { for_each = var.private_subnet_ids content { @@ -63,7 +61,6 @@ resource "rafay_eks_cluster" "cluster" { id = public.key } } - } } cluster_endpoints { private_access = true From 97122562dd35809303aa0ea7a23496dd0d03ad2a Mon Sep 17 00:00:00 2001 From: david-rafay <76073534+david-rafay@users.noreply.github.com> Date: Tue, 19 Nov 2024 22:34:50 -0800 Subject: [PATCH 6/6] Update variables.tf --- terraform/caas_terraform/eks/modules/eks/variables.tf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/terraform/caas_terraform/eks/modules/eks/variables.tf b/terraform/caas_terraform/eks/modules/eks/variables.tf index 918004d..b873aa1 100644 --- a/terraform/caas_terraform/eks/modules/eks/variables.tf +++ b/terraform/caas_terraform/eks/modules/eks/variables.tf @@ -36,12 +36,6 @@ variable "cluster_labels" { description = "Map of cluster labels for cluster" } -variable "create_vpc" { - type = bool - default = true - description = "Create VPC & Subnets" -} - variable "private_subnet_ids" { type = map(string) default = {}