enable eks auto mode

Author: sohanyadav

cluster.tf

@@ -43,8 +43,8 @@ resource "aws_eks_cluster" "cluster" {
   dynamic "compute_config" {
     for_each = var.eks_auto_mode_enabled ? [1] : []
     content {
-      enabled       = true
-      node_pools    = ["general-purpose"]
+      enabled       = var.compute_config.enabled
+      node_pools    = var.compute_config.node_pools
       node_role_arn = aws_iam_role.eks_auto[0].arn
     }
   }

examples/eks/main.tf

@@ -1,34 +1,35 @@
-provider "aws" {
-  # TODO: Change this
-  profile = "opszero"
-  # TODO: Change this
-  region = "us-west-2"
-}
+#provider "aws" {
+#  # TODO: Change this
+#  profile = "opszero"
+#  # TODO: Change this
+#  region = "us-west-2"
+#}
 
 locals {
-  environment_name = "appcensus-dev"
-  profile          = "appcensus-staging"
+  environment_name = "auguria-pj5za11"
+  #  profile          = "appcensus-staging"
 }
 
 provider "aws" {
-  profile = local.profile
-  region  = "us-east-1"
+  #  profile = local.profile
+  region = "us-east-1"
 }
 
 provider "helm" {
   kubernetes {
-    config_path = "./kubeconfig"
+    config_path = "~/kubeconfig"
   }
 }
 
 provider "kubernetes" {
-  config_path = "./kubeconfig"
+  config_path = "~/kubeconfig"
 }
 
 
+data "aws_caller_identity" "current" {}
 
 module "opszero-eks" {
-  source = "github.com/opszero/terraform-aws-kubespot"
+  source = "./../.."
 
   zones = [
     "us-east-1a",
@@ -37,19 +38,30 @@ module "opszero-eks" {
 
   cluster_version  = "1.31"
   environment_name = local.environment_name
-  iam_users = {
-    "abhi@opszero.com" = {
-      rbac_groups = [
-        "system:masters"
-      ]
-    },
-    "bitbucket-deployer" = {
-      rbac_groups = [
-        "system:masters"
-      ]
+  #  iam_users = {
+  #    "abhi@opszero.com" = {
+  #      rbac_groups = [
+  #        "system:masters"
+  #      ]
+  #    },
+  #    "bitbucket-deployer" = {
+  #      rbac_groups = [
+  #        "system:masters"
+  #      ]
+  #    },
+  #
+  #  }
+  cluster_authentication_mode = "API"
+
+  access_policies = [
+    {
+      principal_arn = "arn:aws:iam::${data.aws_caller_identity.current.account_id}:role/OrganizationAccountAccessRole"
+      policy_arn    = "arn:aws:eks::aws:cluster-access-policy/AmazonEKSClusterAdminPolicy"
+      access_scope = {
+        type = "cluster"
+      }
     },
-
-  }
+  ]
   cidr_block = "10.3.0.0/16"
   cidr_block_public_subnet = [
     "10.3.0.0/18",
@@ -61,27 +73,27 @@ module "opszero-eks" {
   ]
 
   node_groups = {
-    "t3a-medium-spot" = {
-      # Have to use a custom launch template to get encrypted root volumes.
-      instance_types = [
-        "t3a.medium",
-      ]
-      capacity_type          = "SPOT"
-      nodes_in_public_subnet = false
-      node_desired_capacity  = 3,
-      nodes_max_size         = 3,
-      nodes_min_size         = 3
-      ami_type               = "CUSTOM"
-      node_disk_encrypted    = true
-    },
+    #    "t3a-medium-spot" = {
+    #      # Have to use a custom launch template to get encrypted root volumes.
+    #      instance_types = [
+    #        "t3a.medium",
+    #      ]
+    #      capacity_type          = "SPOT"
+    #      nodes_in_public_subnet = false
+    #      node_desired_capacity  = 3,
+    #      nodes_max_size         = 3,
+    #      nodes_min_size         = 3
+    #      ami_type               = "CUSTOM"
+    #      node_disk_encrypted    = true
+    #    },
     "t3a-medium-spot2" = {
       instance_types = [
         "t3a.medium",
       ]
       node_disk_size         = 32
       nodes_in_public_subnet = false
-      node_desired_capacity  = 1,
-      nodes_max_size         = 1,
+      node_desired_capacity  = 3,
+      nodes_max_size         = 3,
       nodes_min_size         = 1
       node_disk_encrypted    = true
     }
@@ -96,14 +108,14 @@ module "opszero-eks" {
   efs_enabled           = false
   #csi
   s3_csi_driver_enabled = false
-  s3_csi_bucket_names   = ["test-6647373dd"] #name of s3
+  s3_csi_bucket_names   = ["test-66472373dd"] #name of s3
 }
 
-module "helm-common" {
-  source             = "github.com/opszero/terraform-helm-kubespot"
-  cert_manager_email = "ops@opszero.com"
-
-  nginx_min_replicas = 1
-  nginx_max_replicas = 3
-}
+#module "helm-common" {
+#  source             = "github.com/opszero/terraform-helm-kubespot"
+#  cert_manager_email = "ops@opszero.com"
+#
+#  nginx_min_replicas = 1
+#  nginx_max_replicas = 3
+#}
 

variables.tf

@@ -504,4 +504,15 @@ variable "eks_auto_mode_enabled" {
   description = "Enable Auto Mode for EKS cluster"
   type        = bool
   default     = true
-}
+}
+variable "compute_config" {
+  description = "Configuration for the compute nodes in the EKS cluster"
+  type = object({
+    enabled       = bool
+    node_pools    = list(string)
+  })
+  default = {
+    enabled       = true
+    node_pools    = ["general-purpose"]
+  }
+}